diff options
| author | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-02 02:32:10 +0000 |
|---|---|---|
| committer | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-02 02:32:10 +0000 |
| commit | 7ed0821f86e4b70dc75e18c4c960e8d2d895c647 (patch) | |
| tree | e6c4cb63722c260d6c229f938dc9a28800bf50ae /TAO | |
| parent | 77f6a46a8d173c3c6b20065623ed1c50857d2afb (diff) | |
| download | ATCD-7ed0821f86e4b70dc75e18c4c960e8d2d895c647.tar.gz | |
ChangeLogTag: Thu Feb 1 20:29:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
Diffstat (limited to 'TAO')
267 files changed, 1487 insertions, 1131 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 5cc487ea9c8..9a934aecdd3 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,286 @@ +Thu Feb 1 20:29:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * tao/orbconf.h: + + Added default definitions for TAO_SYNCH_MUTEX, + TAO_SYNCH_RECURSIVE_MUTEX, TAO_SYNCH_RW_MUTEX, and + TAO_SYNCH_CONDITION to allow TAO's use of mutexes + and condition variables to be globally changed at + compile time. + + This change was most important for the RT Mutex + implementation which requires that the mutexes + that it returns to users have the same semantics + (priority inheritance, etc.) as the ones used in + the ORB. + + * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: + * docs/Smart_Proxies.html: + * docs/events_tutorial.html: + * examples/Content_Server/AMI_Observer/Callback_i.cpp: + * examples/Content_Server/AMI_Observer/Callback_i.h: + * examples/Load_Balancing_persistent/Load_Balancer_i.h: + * orbsvcs/IFR_Service/InterfaceS.cpp: + * orbsvcs/IFR_Service/InterfaceS.h: + * orbsvcs/IFR_Service/Repository_i.cpp: + * orbsvcs/IFR_Service/ifr_visitor.cpp: + * orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff: + * orbsvcs/IFR_Service/diffs/InterfaceS.h.diff: + * orbsvcs/ImplRepo_Service/NT_Service.h: + * orbsvcs/Naming_Service/NT_Naming_Service.h: + * orbsvcs/Scheduling_Service/Scheduling_Service.cpp: + * orbsvcs/Scheduling_Service/Scheduling_Service.h: + * orbsvcs/examples/Notify/Filter/Filter.cpp: + * orbsvcs/examples/Notify/Subscribe/Subscribe.cpp: + * orbsvcs/examples/RtEC/Schedule/Service.cpp: + * orbsvcs/orbsvcs/Event_Service_Constants.h: + * orbsvcs/orbsvcs/AV/TCP.cpp: + * orbsvcs/orbsvcs/AV/sfp.cpp: + * orbsvcs/orbsvcs/AV/sfp.h: + * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp: + * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h: + * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp: + * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h: + * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h: + * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp: + * orbsvcs/orbsvcs/ETCL/ETCL_l.cpp.diff: + * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp: + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp: + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h: + * orbsvcs/orbsvcs/Event/EC_Gateway.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway.h: + * orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp: + * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h: + * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp: + * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp: + * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h: + * orbsvcs/orbsvcs/Event/Event_Manip.cpp: + * orbsvcs/orbsvcs/Event/Event_Manip.h: + * orbsvcs/orbsvcs/Event/Memory_Pools.cpp: + * orbsvcs/orbsvcs/Event/Memory_Pools.h: + * orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp: + * orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h: + * orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp: + * orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h: + * orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp: + * orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h: + * orbsvcs/orbsvcs/Log/LogMgr_i.cpp: + * orbsvcs/orbsvcs/Log/LogMgr_i.h: + * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp: + * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h: + * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp: + * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h: + * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp: + * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h: + * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp: + * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp: + * orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp: + * orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h: + * orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Event.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Event_Map.h: + * orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h: + * orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Filter_i.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp: + * orbsvcs/orbsvcs/Sched/DynSched.cpp: + * orbsvcs/orbsvcs/Sched/DynSched.h: + * orbsvcs/orbsvcs/Sched/Scheduler.cpp: + * orbsvcs/orbsvcs/Sched/Scheduler.h: + * orbsvcs/orbsvcs/Sched/Scheduler_Generic.h: + * orbsvcs/orbsvcs/Trader/Interpreter.cpp: + * orbsvcs/orbsvcs/Trader/Interpreter.h: + * orbsvcs/orbsvcs/Trader/Trader.cpp: + * orbsvcs/tests/AVStreams/benchmark/child.cpp: + * orbsvcs/tests/AVStreams/benchmark/child.h: + * orbsvcs/tests/AVStreams/benchmark/client.cpp: + * orbsvcs/tests/AVStreams/benchmark/client.h: + * orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp: + * orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h: + * orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp: + * orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h: + * orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp: + * orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h: + * orbsvcs/tests/CosEvent/Basic/Random.cpp: + * orbsvcs/tests/CosEvent/Basic/Random.h: + * orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp: + * orbsvcs/tests/CosEvent/lib/Counting_Consumer.h: + * orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp: + * orbsvcs/tests/CosEvent/lib/Counting_Supplier.h: + * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp: + * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h: + * orbsvcs/tests/EC_Mcast/EC_Mcast.h: + * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: + * orbsvcs/tests/EC_Multiple/EC_Multiple.h: + * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Consumer.h: + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h: + * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Throughput.h: + * orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp: + * orbsvcs/tests/Event/Basic/Atomic_Reconnect.h: + * orbsvcs/tests/Event/Basic/Control.cpp: + * orbsvcs/tests/Event/Basic/Control.h: + * orbsvcs/tests/Event/Basic/Observer.cpp: + * orbsvcs/tests/Event/Basic/Observer.h: + * orbsvcs/tests/Event/Basic/Random.cpp: + * orbsvcs/tests/Event/Basic/Random.h: + * orbsvcs/tests/Event/Performance/Latency.cpp: + * orbsvcs/tests/Event/Performance/Latency.h: + * orbsvcs/tests/Event/lib/Consumer.cpp: + * orbsvcs/tests/Event/lib/Consumer.h: + * orbsvcs/tests/Event/lib/Counting_Supplier.cpp: + * orbsvcs/tests/Event/lib/Counting_Supplier.h: + * orbsvcs/tests/Event/lib/Supplier.cpp: + * orbsvcs/tests/Event/lib/Supplier.h: + * orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp: + * orbsvcs/tests/Notify/Basic/ConnectDisconnect.h: + * orbsvcs/tests/Notify/Basic/Events_Test.cpp: + * orbsvcs/tests/Notify/Basic/Events_Test.h: + * orbsvcs/tests/Notify/Basic/Simple.cpp: + * orbsvcs/tests/Notify/Basic/Simple.h: + * orbsvcs/tests/Notify/Basic/Updates.cpp: + * orbsvcs/tests/Notify/Basic/Updates.h: + * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp: + * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h: + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h: + * performance-tests/Callback/Callback_i.cpp: + * performance-tests/Callback/Callback_i.h: + * performance-tests/Callback/client.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/Globals.h: + * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h: + * performance-tests/Cubit/TAO/MT_Cubit/client.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/server.cpp: + * tao/Environment.cpp: + * tao/Environment.h: + * tao/Exception.cpp: + * tao/Exception.h: + * tao/IIOP_Connector.cpp: + * tao/Leader_Follower.cpp: + * tao/Leader_Follower.h: + * tao/Leader_Follower.i: + * tao/MProfile.cpp: + * tao/MProfile.h: + * tao/Muxed_TMS.cpp: + * tao/Muxed_TMS.h: + * tao/NVList.cpp: + * tao/NVList.h: + * tao/ORB.cpp: + * tao/ORB.h: + * tao/ORB.i: + * tao/ORBInitializer_Registry.cpp: + * tao/ORBInitializer_Registry.h: + * tao/ORBInitializer_Registry.inl: + * tao/ORB_Core.cpp: + * tao/ORB_Core.h: + * tao/ORB_Core.i: + * tao/ORB_Table.cpp: + * tao/ORB_Table.h: + * tao/ORB_Table.inl: + * tao/Object.h: + * tao/Object.i: + * tao/Policy_Manager.h: + * tao/Policy_Manager.i: + * tao/Principal.h: + * tao/Profile.h: + * tao/Profile.i: + * tao/Single_Reactor.cpp: + * tao/Stub.cpp: + * tao/Stub.h: + * tao/Synch_Reply_Dispatcher.h: + * tao/TAO_Internal.cpp: + * tao/TAO_Singleton_Manager.cpp: + * tao/TAO_Singleton_Manager.h: + * tao/Transport.cpp: + * tao/Transport.h: + * tao/Typecode.cpp: + * tao/Typecode.h: + * tao/Typecode.i: + * tao/ValueBase.h: + * tao/ValueBase.i: + * tao/ValueFactory.h: + * tao/ValueFactory.i: + * tao/ValueFactory_Map.cpp: + * tao/ValueFactory_Map.h: + * tao/Wait_On_Leader_Follower.cpp: + * tao/Wait_On_Leader_Follower.h: + * tao/Wait_Strategy.cpp: + * tao/Wait_Strategy.h: + * tao/default_client.cpp: + * tao/default_resource.cpp: + * tao/default_server.cpp: + * tao/DynamicInterface/Context.cpp: + * tao/DynamicInterface/Context.h: + * tao/DynamicInterface/ExceptionList.cpp: + * tao/DynamicInterface/ExceptionList.h: + * tao/DynamicInterface/Request.cpp: + * tao/DynamicInterface/Request.h: + * tao/DynamicInterface/Server_Request.cpp: + * tao/DynamicInterface/Server_Request.h: + * tao/IORTable/IOR_Table_Impl.cpp: + * tao/IORTable/IOR_Table_Impl.h: + * tao/PortableServer/ImplRepoC.cpp: + * tao/PortableServer/ImplRepoC.h: + * tao/PortableServer/MessagingS.cpp: + * tao/PortableServer/MessagingS.h: + * tao/PortableServer/Object_Adapter.cpp: + * tao/PortableServer/Object_Adapter.h: + * tao/PortableServer/Object_Adapter.i: + * tao/PortableServer/Operation_Table.cpp: + * tao/PortableServer/Operation_Table.h: + * tao/PortableServer/POA.cpp: + * tao/PortableServer/POA.h: + * tao/PortableServer/Servant_Base.cpp: + * tao/PortableServer/Servant_Base.h: + * tao/PortableServer/Strategized_Object_Proxy_Broker.cpp: + * tao/PortableServer/Strategized_Object_Proxy_Broker.h: + * tao/Strategies/Reactor_Per_Priority.cpp: + * tao/Strategies/Reactor_Per_Priority.h: + * tao/Strategies/SHMIOP_Connector.cpp: + * tao/Strategies/TAO_Strategies_Internal.cpp: + * tao/Strategies/UIOP_Connector.cpp: + * tao/Strategies/advanced_resource.cpp: + * tao/diffs/MessagingC.cpp.diff: + * tao/diffs/MessagingC.h.diff: + * tests/Leader_Followers/client.cpp: + * tests/LongUpcalls/AMI_Manager.cpp: + * tests/LongUpcalls/AMI_Manager.h: + * tests/LongUpcalls/Controller.cpp: + * tests/LongUpcalls/Controller.h: + * tests/Param_Test/helper.cpp: + * tests/Param_Test/helper.h: + * tests/Param_Test/options.cpp: + * tests/Param_Test/options.h: + + Changed occurrances of ACE_SYNCH_* to their + new TAO_SYNCH_* equivalents. In some cases, + occurrances of Ace_Thread_Mutex, + Ace_Recursive_Thread_Mutex, and Ace_RW_Thread_Mutex + were changed to their TAO_SYNCH_ forms. + + Thu Feb 1 09:36:26 2001 Jeff Parsons <parsons@cs.wustl.edu> * examples/AMI/FL_Callback/peer.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp index c78072777df..7f168dea521 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp @@ -91,7 +91,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "{" << be_nl << "public:" << be_idt_nl << be_nl << "friend class TAO_Singleton<TAO_" << node->flat_name () - << "_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl + << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl << "int register_proxy_factory (" << be_idt << be_idt_nl << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl << "int one_shot_factory = 1,"<<be_nl @@ -122,12 +122,12 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "_Default_Proxy_Factory *proxy_factory_;" << be_nl << "int one_shot_factory_;" << be_nl << "int disable_factory_;"<<be_nl - << "ACE_SYNCH_RECURSIVE_MUTEX lock_;"<<be_nl << be_uidt_nl + << "TAO_SYNCH_RECURSIVE_MUTEX lock_;"<<be_nl << be_uidt_nl << "};\n\n"; os->indent (); *os << "typedef TAO_Singleton<TAO_"<<node->flat_name () - << "_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_" + << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_" << node->flat_name ()<< "_PROXY_FACTORY_ADAPTER;"<<be_nl << be_nl; *os << "class " << be_global->stub_export_macro ()<< " " diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp index dfefcac77d0..dfd8a2cd18b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp @@ -155,7 +155,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << ")" << be_uidt << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" - << "ACE_Recursive_Thread_Mutex, ace_mon," << be_idt_nl + << "TAO_SYNCH_RECURSIVE_MUTEX, ace_mon," << be_idt_nl << "this->lock_, 0));" <<be_uidt_nl << "// Remove any existing <proxy_factory_> and replace with the new one."<<be_nl << "this->unregister_proxy_factory (ACE_TRY_ENV);" << be_nl @@ -178,7 +178,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" - << "ACE_Recursive_Thread_Mutex, ace_mon," << be_idt_nl + << "TAO_SYNCH_RECURSIVE_MUTEX, ace_mon," << be_idt_nl << "this->lock_, 0));" <<be_uidt_nl << "if (this->one_shot_factory_ == 1)"<<be_idt_nl << "this->disable_factory_ = 1;"<<be_uidt_nl <<be_nl @@ -208,7 +208,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" - << "ACE_Recursive_Thread_Mutex, ace_mon," << be_idt_nl + << "TAO_SYNCH_RECURSIVE_MUTEX, ace_mon," << be_idt_nl << "this->lock_, 0));" <<be_uidt_nl<<be_nl << "// To take care of those <unchecked_narrow> methods where we "<<be_nl << "// want to override the smart proxy factory if there exists one."<<be_nl @@ -319,7 +319,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) if (node->is_nested ()) *os << "::"; *os <<"TAO_" <<node->flat_name () - << "_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;"<<be_nl + << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX >;"<<be_nl << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl << "#pragma instantiate TAO_Singleton<"; @@ -329,7 +329,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) if (node->is_nested ()) *os << "::"; *os << "TAO_"<<node->flat_name () - << "_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>"<<be_nl + << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>"<<be_nl << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */"<<be_nl<<be_nl; } else diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp index 2f1f589b215..944d34e8428 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp @@ -67,7 +67,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface << "::" << node->full_base_proxy_impl_name () << be_nl <<" *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];" << be_nl << be_nl - << "ACE_SYNCH_MUTEX mutex_;" + << "TAO_SYNCH_MUTEX mutex_;" << be_uidt_nl; // Factory Function declaration. diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp index cad2e33b9ff..ace471ec940 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp @@ -105,7 +105,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_uidt_nl // idt = 0 << "{" << be_idt_nl // idt = 1 - << "ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_);" + << "ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);" << be_nl << be_nl << "if (this->proxy_cache_[strategy] == 0)" << be_idt_nl // idt = 2 diff --git a/TAO/docs/Smart_Proxies.html b/TAO/docs/Smart_Proxies.html index d649fb83f25..f8e3a351994 100644 --- a/TAO/docs/Smart_Proxies.html +++ b/TAO/docs/Smart_Proxies.html @@ -153,7 +153,7 @@ class TAO_Proxy_Factory_Adapter // default/smart Proxys. public: - friend class ACE_Singleton<TAO_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; + friend class ACE_Singleton<TAO_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; // Register the factory with the Adaptor. register_proxy (TAO_Default_Proxy_Factory *df) @@ -193,7 +193,7 @@ protected: TAO_Test_Default_Proxy_Factory *proxy_factory_; int delete_proxy_factory_; - ACE_Recursive_Thread_Mutex lock_; + TAO_SYNCH_RECURSIVE_MUTEX lock_; }; diff --git a/TAO/docs/events_tutorial.html b/TAO/docs/events_tutorial.html index ae78b59cc76..20097005bea 100644 --- a/TAO/docs/events_tutorial.html +++ b/TAO/docs/events_tutorial.html @@ -876,7 +876,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events, } // Make sure only one thread has access. - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); // We start the timer as soon as we receive the first event. if (this->recv_count_ == 0) diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index a0b0ac452ef..e2451c0ebbe 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -73,7 +73,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, else { { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); @@ -109,7 +109,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata) ACE_TRY { { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); this->metadata_ = metadata; @@ -145,7 +145,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata) int Callback_i::metadata_received (void) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0)); @@ -156,7 +156,7 @@ Callback_i::metadata_received (void) int Callback_i::content_received (void) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0)); diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h index 1393c74a426..1a14d9ae55e 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h @@ -124,7 +124,7 @@ private: int last_chunk_; // Flag that indicates entire data content has been received. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock used to prevent race conditions when checking to see if // metadata or entire content has been received. diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index 7b95fa3063e..888bc737f7a 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -35,7 +35,7 @@ #endif /* _MSC_VER */ typedef ACE_Allocator_Adapter <ACE_Malloc<ACE_MMAP_MEMORY_POOL, - ACE_SYNCH_MUTEX> > ALLOCATOR; + TAO_SYNCH_MUTEX> > ALLOCATOR; typedef ACE_Hash_Map_With_Allocator<char *, char *> HASH_MAP; diff --git a/TAO/orbsvcs/IFR_Service/InterfaceS.cpp b/TAO/orbsvcs/IFR_Service/InterfaceS.cpp index 540f033d60b..7310a2f1791 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceS.cpp +++ b/TAO/orbsvcs/IFR_Service/InterfaceS.cpp @@ -191,7 +191,7 @@ _TAO_IRObject_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -669,7 +669,7 @@ POA_IR::_TAO_Contained_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -1678,7 +1678,7 @@ POA_IR::_TAO_Container_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -3229,7 +3229,7 @@ POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -3671,7 +3671,7 @@ POA_IR::_TAO_Repository_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -4596,7 +4596,7 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -5166,7 +5166,7 @@ POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -5550,7 +5550,7 @@ POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -6210,7 +6210,7 @@ POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -6608,7 +6608,7 @@ POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -7132,7 +7132,7 @@ POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -7806,7 +7806,7 @@ POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -8306,7 +8306,7 @@ POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -8804,7 +8804,7 @@ POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -9158,7 +9158,7 @@ POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -9580,7 +9580,7 @@ POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -10060,7 +10060,7 @@ POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -10542,7 +10542,7 @@ POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -11139,7 +11139,7 @@ POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -11792,7 +11792,7 @@ POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -12470,7 +12470,7 @@ POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -13007,7 +13007,7 @@ POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -13727,7 +13727,7 @@ POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -14755,7 +14755,7 @@ POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -15745,7 +15745,7 @@ POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -16442,7 +16442,7 @@ POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -17971,7 +17971,7 @@ POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -18469,7 +18469,7 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -18902,7 +18902,7 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -19391,7 +19391,7 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -19889,7 +19889,7 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -20270,7 +20270,7 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -20651,7 +20651,7 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -21072,7 +21072,7 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -22372,7 +22372,7 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -22928,7 +22928,7 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -23367,7 +23367,7 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { @@ -23784,7 +23784,7 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { diff --git a/TAO/orbsvcs/IFR_Service/InterfaceS.h b/TAO/orbsvcs/IFR_Service/InterfaceS.h index 1b509aafb29..6cdb0b3b1a5 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceS.h +++ b/TAO/orbsvcs/IFR_Service/InterfaceS.h @@ -168,7 +168,7 @@ private: // instances of a given IDL interface type. _TAO_IRObject_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -507,7 +507,7 @@ private: _TAO_Contained_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -1201,7 +1201,7 @@ private: _TAO_Container_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -1787,7 +1787,7 @@ private: _TAO_IDLType_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -2266,7 +2266,7 @@ private: _TAO_Repository_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -3030,7 +3030,7 @@ private: _TAO_ComponentRepository_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -3755,7 +3755,7 @@ private: _TAO_ModuleDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -4406,7 +4406,7 @@ private: _TAO_ConstantDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -4884,7 +4884,7 @@ private: _TAO_TypedefDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -5440,7 +5440,7 @@ private: _TAO_StructDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -6261,7 +6261,7 @@ private: _TAO_UnionDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -6963,7 +6963,7 @@ private: _TAO_EnumDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -7432,7 +7432,7 @@ private: _TAO_AliasDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -7868,7 +7868,7 @@ private: _TAO_NativeDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -8198,7 +8198,7 @@ private: _TAO_PrimitiveDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -8467,7 +8467,7 @@ private: _TAO_StringDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -8754,7 +8754,7 @@ private: _TAO_WstringDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -9074,7 +9074,7 @@ private: _TAO_FixedDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -9444,7 +9444,7 @@ private: _TAO_SequenceDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -9830,7 +9830,7 @@ private: _TAO_ArrayDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -10383,7 +10383,7 @@ private: _TAO_ExceptionDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -11084,7 +11084,7 @@ private: _TAO_AttributeDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -11735,7 +11735,7 @@ private: _TAO_OperationDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -12598,7 +12598,7 @@ private: _TAO_InterfaceDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -13440,7 +13440,7 @@ private: _TAO_ValueMemberDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -14354,7 +14354,7 @@ private: _TAO_ValueDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -15317,7 +15317,7 @@ private: _TAO_ValueBoxDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -15761,7 +15761,7 @@ private: _TAO_ProvidesDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -16195,7 +16195,7 @@ private: _TAO_UsesDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -16646,7 +16646,7 @@ private: _TAO_EventDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -17082,7 +17082,7 @@ private: _TAO_EmitsDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -17501,7 +17501,7 @@ private: _TAO_PublishesDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -17920,7 +17920,7 @@ private: _TAO_ConsumesDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -18769,7 +18769,7 @@ private: _TAO_ComponentDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -19737,7 +19737,7 @@ private: _TAO_PrimaryKeyDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -20245,7 +20245,7 @@ private: _TAO_FactoryDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -20812,7 +20812,7 @@ private: _TAO_FinderDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. @@ -21649,7 +21649,7 @@ private: _TAO_HomeDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given // interface. diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.cpp b/TAO/orbsvcs/IFR_Service/Repository_i.cpp index 6ee8a571aa1..84c64e05424 100644 --- a/TAO/orbsvcs/IFR_Service/Repository_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Repository_i.cpp @@ -28,7 +28,7 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, if (OPTIONS::instance ()->enable_locking ()) { ACE_NEW_THROW_EX (this->lock_, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (), + ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (), CORBA::NO_MEMORY ()); } else diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff index b382d6f5028..9943343a372 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff @@ -2293,7 +2293,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - return result_any; -} @@ -3892,7 +3892,7 @@ - ) +) { -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -5177,7 +5177,7 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents ri ( - _tao_server_request, @@ -6144,7 +6144,7 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union ri ( - _tao_server_request, @@ -8848,7 +8848,7 @@ - CORBA::ULong length_base_interfaces = parameter_list->length (); - parameter_list->length (length_base_interfaces + 1); - (*parameter_list)[length_base_interfaces].argument <<= this->base_interfaces_; -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN; - @@ -9799,7 +9799,7 @@ + const char* logical_type_id ) { -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -10234,7 +10234,7 @@ - POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - _tao_server_request.init_reply (); - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -12410,7 +12410,7 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - Dynamic::ParameterList_var safe_parameter_list = parameter_list; + if (this->proxy_cache_[strategy] == 0) @@ -21599,7 +21599,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -26727,7 +26727,7 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - return parameter_list; + if (this->proxy_cache_[strategy] == 0) @@ -27396,7 +27396,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -30484,7 +30484,7 @@ CORBA::Environment &ACE_TRY_ENV ) { -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -30790,7 +30790,7 @@ + CORBA::Environment &ACE_TRY_ENV + ) +{ -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); + + if (this->proxy_cache_[strategy] == 0) + { @@ -31992,7 +31992,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - return result_any; -} @@ -32547,7 +32547,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -34995,7 +34995,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -37291,7 +37291,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -38633,7 +38633,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -42672,7 +42672,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -43429,7 +43429,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -43993,7 +43993,7 @@ - CORBA::Environment &ACE_TRY_ENV - ) -{ -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -44944,7 +44944,7 @@ + CORBA::SystemException + )) { -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -46225,7 +46225,7 @@ - ) +) { -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -48547,7 +48547,7 @@ - interface_type, - ACE_TRY_ENV - ); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); + + if (this->proxy_cache_[strategy] == 0) + { @@ -50207,7 +50207,7 @@ { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference; -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); + + if (this->proxy_cache_[strategy] == 0) + { @@ -51064,7 +51064,7 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - return parameter_list; + if (this->proxy_cache_[strategy] == 0) @@ -51893,7 +51893,7 @@ - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); +{ -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - Dynamic::ParameterList_var safe_parameter_list = parameter_list; - @@ -52611,7 +52611,7 @@ + CORBA::Environment &ACE_TRY_ENV + ) +{ -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); + + if (this->proxy_cache_[strategy] == 0) + { @@ -53000,7 +53000,7 @@ + CORBA::SystemException + )) { -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -54164,7 +54164,7 @@ - ) +) { -- ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); +- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - - if (this->proxy_cache_[strategy] == 0) - { @@ -56276,7 +56276,7 @@ - exceptions, - ACE_TRY_ENV - ); -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); + + if (this->proxy_cache_[strategy] == 0) + { @@ -56915,7 +56915,7 @@ ) { - POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference; -+ ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); ++ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); + + if (this->proxy_cache_[strategy] == 0) + { diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff index e1f19abd250..ef4b62c2985 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff @@ -351,7 +351,7 @@ - + _TAO_IRObject_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; // This funxtion is used to get an handle to the unique instance // of the Strategized Proxy Broker that is available for a given @@ -305,16 +187,16 @@ @@ -1391,7 +1391,7 @@ + _TAO_Contained_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -1273,7 +516,6 @@ static _TAO_Contained_Strategized_Proxy_Broker *the_TAO_Contained_Strategized_Proxy_Broker (void); }; @@ -2825,7 +2825,7 @@ + _TAO_Container_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -3982,7 +3982,7 @@ + _TAO_IDLType_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -2865,10 +1793,9 @@ // interface. @@ -4987,7 +4987,7 @@ + _TAO_Repository_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -3512,10 +2272,9 @@ // interface. @@ -6295,7 +6295,7 @@ - ::IR::_TAO_Repository_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -6644,7 +6644,7 @@ + _TAO_ComponentRepository_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -8036,7 +8036,7 @@ + _TAO_ModuleDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -5332,10 +3761,9 @@ // interface. @@ -9290,7 +9290,7 @@ + _TAO_ConstantDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -6067,10 +4412,9 @@ // interface. @@ -10545,7 +10545,7 @@ + _TAO_TypedefDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -6983,10 +4890,9 @@ // interface. @@ -11377,7 +11377,7 @@ - ::IR::_TAO_TypedefDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -11636,7 +11636,7 @@ + _TAO_StructDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -12649,7 +12649,7 @@ - ::IR::_TAO_StructDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -12937,7 +12937,7 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )); -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -14255,7 +14255,7 @@ + _TAO_EnumDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -14576,7 +14576,7 @@ - ::IR::_TAO_UnionDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -15457,7 +15457,7 @@ + _TAO_AliasDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -15978,7 +15978,7 @@ - ::IR::_TAO_EnumDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -16363,7 +16363,7 @@ + _TAO_NativeDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -16962,7 +16962,7 @@ + _TAO_PrimitiveDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -10625,10 +8204,9 @@ // interface. @@ -17574,7 +17574,7 @@ + _TAO_StringDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -11073,10 +8473,9 @@ // interface. @@ -18148,7 +18148,7 @@ + _TAO_WstringDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -11466,10 +8760,9 @@ // interface. @@ -18731,7 +18731,7 @@ + _TAO_FixedDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -11848,10 +9080,9 @@ // interface. @@ -19381,7 +19381,7 @@ + _TAO_SequenceDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -12248,10 +9450,9 @@ // interface. @@ -20166,7 +20166,7 @@ + _TAO_ArrayDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -12782,10 +9836,9 @@ // interface. @@ -21202,7 +21202,7 @@ + _TAO_ExceptionDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -13417,10 +10389,9 @@ // interface. @@ -22217,7 +22217,7 @@ - ::IR::_TAO_ArrayDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -22513,7 +22513,7 @@ + _TAO_AttributeDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -23572,7 +23572,7 @@ - ::IR::_TAO_ExceptionDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -23839,7 +23839,7 @@ + _TAO_OperationDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -25352,7 +25352,7 @@ + _TAO_InterfaceDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -15751,10 +12604,9 @@ // interface. @@ -27214,7 +27214,7 @@ + _TAO_ValueMemberDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -16970,10 +13446,9 @@ // interface. @@ -28946,7 +28946,7 @@ + _TAO_ValueDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -29357,7 +29357,7 @@ - ::IR::_TAO_InterfaceDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -31166,7 +31166,7 @@ + _TAO_ValueBoxDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -19440,10 +15323,9 @@ // interface. @@ -32036,7 +32036,7 @@ + _TAO_ProvidesDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -33113,7 +33113,7 @@ + _TAO_UsesDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -34135,7 +34135,7 @@ + _TAO_EventDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -21319,10 +16652,9 @@ // interface. @@ -35095,7 +35095,7 @@ + _TAO_EmitsDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -35887,7 +35887,7 @@ + _TAO_PublishesDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -22395,10 +17507,9 @@ // interface. @@ -36698,7 +36698,7 @@ + _TAO_ConsumesDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -22902,10 +17926,9 @@ // interface. @@ -37660,7 +37660,7 @@ - ::IR::_TAO_UsesDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -38221,7 +38221,7 @@ + _TAO_ComponentDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -38604,7 +38604,7 @@ - ::IR::_TAO_EventDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -39492,7 +39492,7 @@ - ::IR::_TAO_EmitsDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -40200,7 +40200,7 @@ + _TAO_PrimaryKeyDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -24896,10 +19743,9 @@ // interface. @@ -41025,7 +41025,7 @@ + _TAO_FactoryDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -25327,10 +20251,9 @@ // interface. @@ -42123,7 +42123,7 @@ + _TAO_FinderDef_Proxy_Impl + *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; + -+ ACE_SYNCH_MUTEX mutex_; ++ TAO_SYNCH_MUTEX mutex_; +// This funxtion is used to get an handle to the unique instance +// of the Strategized Proxy Broker that is available for a given +// interface. @@ -43496,7 +43496,7 @@ - ::IR::_TAO_ComponentDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -44800,7 +44800,7 @@ - ::IR::_TAO_PrimaryKeyDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -45320,7 +45320,7 @@ - ::IR::_TAO_FactoryDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -45899,7 +45899,7 @@ - ::IR::_TAO_FinderDef_Proxy_Impl - *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - -- ACE_SYNCH_MUTEX mutex_; +- TAO_SYNCH_MUTEX mutex_; -// This funxtion is used to get an handle to the unique instance -// of the Strategized Proxy Broker that is available for a given -// interface. @@ -47317,7 +47317,7 @@ + _TAO_HomeDef_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; @@ -30465,641 +21658,639 @@ static _TAO_HomeDef_Strategized_Proxy_Broker *the_TAO_HomeDef_Strategized_Proxy_Broker (void); }; diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp index fa664d0d645..1384a99f061 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp @@ -43,7 +43,7 @@ ifr_visitor::ifr_visitor (CORBA::Environment &ACE_TRY_ENV) if (be_global->enable_locking ()) { ACE_NEW_THROW_EX (this->lock_, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (), + ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (), CORBA::NO_MEMORY ()); } else diff --git a/TAO/orbsvcs/ImplRepo_Service/NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/NT_Service.h index 4412c58d4a2..026bf253d5c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/NT_Service.h @@ -38,7 +38,7 @@ static const char *IMR_DESCRIPTION = "Activation service for TAO"; class ImR_NT_Service : public ACE_NT_Service { public: - typedef ACE_Recursive_Thread_Mutex MUTEX; + typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX; /// Constructor (not protected since it is used by ACE_NT_SERVICE_DEFINE). ImR_NT_Service (void); diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index 19e7b9ac96e..de8d4a826cf 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -32,7 +32,7 @@ class TAO_NT_Naming_Service : public ACE_NT_Service // = TITLE // Run the TAO Naming Service as a Windows NT Service. public: - typedef ACE_Recursive_Thread_Mutex MUTEX; + typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX; // = Initialization and termination hooks. TAO_NT_Naming_Service (void); diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index ba8ae33e489..ba6093b1293 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -306,32 +306,32 @@ template class ACE_Auto_Basic_Ptr<RtecScheduler::Config_Info>; template class ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info>; template class ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry>; template class ACE_Equal_To<int>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; template class ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *>; template class ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *>; template class ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *>; -template class ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>; +template class ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; template class ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *>; -template class ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>; -template class ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, ACE_SYNCH_MUTEX>; -template class ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>; -template class TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; -template class TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; -template class TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; +template class ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; +template class ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX>; +template class ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; +template class TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; +template class TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; +template class TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; template class TAO_RSE_Priority_Visitor<TAO_MUF_Reconfig_Sched_Strategy>; -template class TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; -template class TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; +template class TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; +template class TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; template class TAO_RSE_Utilization_Visitor<TAO_MUF_Reconfig_Sched_Strategy>; # endif /* __GNUC__ */ #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -344,32 +344,32 @@ template class TAO_RSE_Utilization_Visitor<TAO_MUF_Reconfig_Sched_Strategy>; #pragma instantiate ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info> #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry> #pragma instantiate ACE_Equal_To<int> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> #pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *> #pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *> #pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *> -#pragma instantiate ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> #pragma instantiate ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *> -#pragma instantiate ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> #pragma instantiate TAO_RSE_Priority_Visitor<TAO_MUF_Reconfig_Sched_Strategy> -#pragma instantiate TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> #pragma instantiate TAO_RSE_Utilization_Visitor<TAO_MUF_Reconfig_Sched_Strategy> # endif /* __GNUC__ */ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h index 2273a41dd1b..d04423f9799 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h @@ -66,7 +66,7 @@ private: (__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) typedef TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, - ACE_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; + TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; #endif /* __GNUC__ */ diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index 50de0f51ab7..206b11b4ba6 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Filter, Filter, "$Id$") #define EVENTS_TO_SEND 30 #define EVENTS_EXPECTED_TO_RECEIVE 9*4 // 2 consumers get the same events from 2 suppliers - ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> g_result_count = 0; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0; FilterClient::FilterClient (void) :done_ (0) @@ -512,10 +512,10 @@ Filter_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::Envir #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 54f4599fe63..b14cbe25f69 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -16,7 +16,7 @@ ACE_RCSID(Notify, Subscribe, "$Id$") #define EVENT_COUNT 4 // number of events we expect the consumer to get from the EC - ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> g_result_count = 0; // we wait for 4 events. + ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0; // we wait for 4 events. Subscribe::Subscribe (void) { @@ -459,10 +459,10 @@ Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::En #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 8341839c1e9..db2b99272e9 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -23,7 +23,7 @@ int config_run = 0; int parse_args (int argc, char *argv[]); -typedef TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; +typedef TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; int main (int argc, char* argv[]) @@ -428,32 +428,32 @@ template class ACE_Auto_Basic_Ptr<RtecScheduler::Config_Info>; template class ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info>; template class ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry>; template class ACE_Equal_To<int>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; template class ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *>; template class ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *>; template class ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *>; -template class ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>; +template class ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; template class ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *>; -template class ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>; -template class ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, ACE_SYNCH_MUTEX>; -template class ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX>; -template class TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; -template class TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; -template class TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; +template class ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; +template class ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX>; +template class ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; +template class TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; +template class TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; +template class TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; template class TAO_RSE_Priority_Visitor<TAO_MUF_Reconfig_Sched_Strategy>; -template class TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; -template class TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX>; +template class TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; +template class TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; template class TAO_RSE_Utilization_Visitor<TAO_MUF_Reconfig_Sched_Strategy>; # endif /* __GNUC__ */ @@ -468,32 +468,32 @@ template class TAO_RSE_Utilization_Visitor<TAO_MUF_Reconfig_Sched_Strategy>; #pragma instantiate ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info> #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry> #pragma instantiate ACE_Equal_To<int> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> #pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *> #pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *> #pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *> -#pragma instantiate ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> #pragma instantiate ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *> -#pragma instantiate ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_RSE_Dependency_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_RSE_DFS_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> #pragma instantiate TAO_RSE_Priority_Visitor<TAO_MUF_Reconfig_Sched_Strategy> -#pragma instantiate TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_RSE_Propagation_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_RSE_SCC_Visitor<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> #pragma instantiate TAO_RSE_Utilization_Visitor<TAO_MUF_Reconfig_Sched_Strategy> # endif /* __GNUC__ */ diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 12969aa5ae3..15fc2136fd9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -674,10 +674,10 @@ template class ACE_Connector<TAO_AV_TCP_Flow_Handler, ACE_SOCK_CONNECTOR>; template class ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler>; template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *>; -template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, TAO_SYNCH_RW_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Acceptor<TAO_AV_TCP_Flow_Handler, ACE_SOCK_Acceptor, ACE_INET_Addr> @@ -685,10 +685,10 @@ template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flo #pragma instantiate ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> #pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *> -#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<TAO_AV_TCP_Flow_Handler> *, TAO_SYNCH_RW_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index fd0c238b99b..57816fc838e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1341,7 +1341,7 @@ template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong,ACE_Hash_Map_Manager<CORBA: template class ACE_Hash_Map_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex>; template class ACE_Hash_Map_Reverse_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex>; -template class ACE_Singleton<TAO_SFP_Base, ACE_SYNCH_MUTEX>; +template class ACE_Singleton<TAO_SFP_Base, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_DNode<TAO_SFP_Fragment_Node> @@ -1366,7 +1366,7 @@ template class ACE_Singleton<TAO_SFP_Base, ACE_SYNCH_MUTEX>; #pragma instantiate ACE_Hash_Map_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Reverse_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex> -#pragma instantiate ACE_Singleton<TAO_SFP_Base, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<TAO_SFP_Base, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ ACE_FACTORY_DEFINE (AV, TAO_AV_SFP_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 6338985a24f..34686a58231 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -193,7 +193,7 @@ protected: }; // Beware the SFP_Base code relies on the Singleton being initialized. -typedef ACE_Singleton <TAO_SFP_Base,ACE_SYNCH_MUTEX> TAO_SFP_BASE; +typedef ACE_Singleton <TAO_SFP_Base,TAO_SYNCH_MUTEX> TAO_SFP_BASE; class TAO_AV_Export TAO_SFP_Object : public TAO_AV_Protocol_Object { diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index dc108b20904..1fd2e3cd945 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -164,7 +164,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode, CC_LockModeEnum lm = lmconvert (mode); - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mlock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mlock_); if (lock_[lm] == 0) // This lock is not held. ACE_THROW (CosConcurrencyControl::LockNotHeld()); @@ -225,7 +225,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, int CC_LockSet::lock_i (CC_LockModeEnum lm) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mlock_, 1); // If the lock is not compatible with the locks we hold allready or // there is lock requests in the queue we cannot grant the lock and // thus we queue the request. Otherwise update the lock count. @@ -246,7 +246,7 @@ CC_LockSet::lock_i (CC_LockModeEnum lm) int CC_LockSet::try_lock_i (CC_LockModeEnum lm) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mlock_, 1); // If the lock we try is compatible with the locks we hold we just // opdates the count. Otherwise we return false. if (compatible (lm) == 0) @@ -265,7 +265,7 @@ int CC_LockSet::change_mode_i (CC_LockModeEnum lm_held, CC_LockModeEnum lm_new) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mlock_, 1); // If the new mode is compatible with the modes we hold we change // the counts for the two locks. If not we must queue the new // request. We can decrement the count for the old mode without @@ -292,7 +292,7 @@ CC_LockSet::change_mode_i (CC_LockModeEnum lm_held, int CC_LockSet::lock_held (CC_LockModeEnum lm) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mlock_, 1); if (lock_[lm] > 0) return 1; else diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 309fb762f60..f647a2e13da 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -172,7 +172,7 @@ private: // Mapping between requested and held lock modes. Used by compatible // (...). Uses the internal enumeration as indices. - ACE_SYNCH_MUTEX mlock_; + TAO_SYNCH_MUTEX mlock_; // Lock to ensure that race conditions does not occur. ACE_Unbounded_Queue <CC_LockModeEnum> lock_queue_; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 1d857c61366..e91e8fbc399 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -34,7 +34,7 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV) { CC_LockSet *ls = 0; - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ()); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ()); ACE_NEW_THROW_EX (ls, CC_LockSet, @@ -51,7 +51,7 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which, { CC_LockSet *ls = 0; - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ()); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ()); // @@ I commented out the following statement becuase it doesn't make any // sense at all. -- Nanbor diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 133cbe25e7b..ad2e6e6b2a5 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -55,7 +55,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); private: - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock to serialize the access to the factory. }; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index c48b8bfa718..83a7deaa407 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -480,12 +480,12 @@ TAO_CEC_Default_Factory::create_proxy_push_consumer_collection (TAO_CEC_EventCha return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x001) return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x002) return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, @@ -500,12 +500,12 @@ TAO_CEC_Default_Factory::create_proxy_push_consumer_collection (TAO_CEC_EventCha return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x011) return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x012) return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, @@ -573,12 +573,12 @@ TAO_CEC_Default_Factory::create_proxy_pull_consumer_collection (TAO_CEC_EventCha return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x001) return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x002) return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, @@ -593,12 +593,12 @@ TAO_CEC_Default_Factory::create_proxy_pull_consumer_collection (TAO_CEC_EventCha return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x011) return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x012) return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, @@ -666,12 +666,12 @@ TAO_CEC_Default_Factory::create_proxy_push_supplier_collection (TAO_CEC_EventCha return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x001) return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x002) return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, @@ -686,12 +686,12 @@ TAO_CEC_Default_Factory::create_proxy_push_supplier_collection (TAO_CEC_EventCha return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x011) return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x012) return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, @@ -759,12 +759,12 @@ TAO_CEC_Default_Factory::create_proxy_pull_supplier_collection (TAO_CEC_EventCha return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x001) return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x002) return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, @@ -779,12 +779,12 @@ TAO_CEC_Default_Factory::create_proxy_pull_supplier_collection (TAO_CEC_EventCha return new TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x011) return new TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x012) return new TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, @@ -851,9 +851,9 @@ TAO_CEC_Default_Factory::create_consumer_lock (void) if (this->consumer_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; else if (this->consumer_lock_ == 1) - return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); else if (this->consumer_lock_ == 2) - return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); return 0; } @@ -869,9 +869,9 @@ TAO_CEC_Default_Factory::create_supplier_lock (void) if (this->supplier_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; else if (this->supplier_lock_ == 1) - return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); else if (this->supplier_lock_ == 2) - return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); return 0; } @@ -1044,11 +1044,11 @@ template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPullSupplier>; template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_List_Iterator, @@ -1090,11 +1090,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_RB_Tree_Iterator, @@ -1137,11 +1137,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_List_Iterator, @@ -1183,11 +1183,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_RB_Tree_Iterator, @@ -1230,19 +1230,19 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Write_Guard< TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, TAO_CEC_PushConsumer_List_Iterator, @@ -1263,19 +1263,19 @@ template class TAO_ESF_Copy_On_Write_Write_Guard< template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Write_Guard< TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_List_Iterator, @@ -1492,11 +1492,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_List_Iterator, @@ -1538,11 +1538,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, TAO_CEC_PullConsumer_RB_Tree_Iterator, @@ -1585,11 +1585,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_List_Iterator, @@ -1631,11 +1631,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier, TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, TAO_CEC_PullSupplier_RB_Tree_Iterator, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index c7ee0ca988f..7c91e11ae66 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -103,10 +103,10 @@ TAO_CEC_Push_Command::execute (CORBA::Environment& ACE_TRY_ENV) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >; +template class ACE_Locked_Data_Block<ACE_Lock_Adapter<TAO_SYNCH_MUTEX> >; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> > +#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<TAO_SYNCH_MUTEX> > #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 35752cb37f3..7fa9ec0ea3b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -51,7 +51,7 @@ private: ACE_Allocator *allocator_; // An per-task allocator - ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> > data_block_; + ACE_Locked_Data_Block<ACE_Lock_Adapter<TAO_SYNCH_MUTEX> > data_block_; // Helper data structure to minimize memory allocations... }; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 5f6bf9afbc8..6a96e0dbcad 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -24,7 +24,7 @@ TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads, void TAO_CEC_MT_Dispatching::activate (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->active_ != 0) return; @@ -48,7 +48,7 @@ TAO_CEC_MT_Dispatching::activate (void) void TAO_CEC_MT_Dispatching::shutdown (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->active_ == 0) return; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index b5c2d86e0ff..e9a1cdab50c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -77,7 +77,7 @@ private: TAO_CEC_Dispatching_Task task_; // The dispatching task - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Synchronize access to internal data int active_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 7456d9e6edf..1932bb080bb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -145,7 +145,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event, if (this->is_connected () == 0) return; - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_); // Ignore errors (void) this->queue_.enqueue_tail (event); @@ -161,7 +161,7 @@ TAO_CEC_ProxyPullSupplier::pull (CORBA::Environment &ACE_TRY_ENV) if (this->is_connected () == 0) ACE_THROW_RETURN (CosEventComm::Disconnected (), 0); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, queue_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, queue_lock_, 0); while (this->queue_.is_empty ()) { this->wait_not_empty_.wait (); @@ -183,7 +183,7 @@ TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event, if (this->is_connected () == 0) ACE_THROW_RETURN (CosEventComm::Disconnected (), 0); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, queue_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, queue_lock_, 0); CORBA::Any any; if (this->queue_.is_empty ()) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 1ea4a5cc5ad..a84eaf99687 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -144,8 +144,8 @@ private: PortableServer::POA_var default_POA_; // Store the default POA. - ACE_SYNCH_MUTEX queue_lock_; - ACE_SYNCH_CONDITION wait_not_empty_; + TAO_SYNCH_MUTEX queue_lock_; + TAO_SYNCH_CONDITION wait_not_empty_; ACE_Unbounded_Queue<CORBA::Any> queue_; // Use a message queue to pass the }; diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp index c1a095184e5..4f45d19870b 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp @@ -666,8 +666,8 @@ YY_DECL #line 50 "ETCL/ETCL.ll" - static ACE_SYNCH_MUTEX mutex; - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, mutex, -1); + static TAO_SYNCH_MUTEX mutex; + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1); TAO_ETCL_Lex_State_Guard lex_helper (state); diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp.diff b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp.diff index 5b87c3845f4..df4a1f69dc8 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp.diff +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp.diff @@ -37,8 +37,8 @@ #line 50 "ETCL/ETCL.ll" -+ static ACE_SYNCH_MUTEX mutex; -+ ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, mutex, -1); ++ static TAO_SYNCH_MUTEX mutex; ++ ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1); + TAO_ETCL_Lex_State_Guard lex_helper (state); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index cd12443f411..ca109793798 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -132,7 +132,7 @@ TAO_EC_ObserverStrategy* TAO_EC_Basic_Factory::create_observer_strategy (TAO_EC_Event_Channel *ec) { ACE_Lock* lock; - ACE_NEW_RETURN (lock, ACE_Lock_Adapter<ACE_SYNCH_MUTEX>, 0); + ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0); return new TAO_EC_Basic_ObserverStrategy (ec, lock); } @@ -191,7 +191,7 @@ TAO_EC_Basic_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSu ACE_Lock* TAO_EC_Basic_Factory::create_consumer_lock (void) { - return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); } void @@ -203,7 +203,7 @@ TAO_EC_Basic_Factory::destroy_consumer_lock (ACE_Lock* x) ACE_Lock* TAO_EC_Basic_Factory::create_supplier_lock (void) { - return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); } void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index df644578568..159558ab75b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -651,7 +651,7 @@ TAO_EC_Default_Factory::create_observer_strategy (TAO_EC_Event_Channel *ec) { // @@ The lock should also be under control of the user... ACE_Lock* lock; - ACE_NEW_RETURN (lock, ACE_Lock_Adapter<ACE_SYNCH_MUTEX>, 0); + ACE_NEW_RETURN (lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0); return new TAO_EC_Basic_ObserverStrategy (ec, lock); } return 0; @@ -699,12 +699,12 @@ TAO_EC_Default_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Chan return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x001) return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x002) return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, @@ -719,12 +719,12 @@ TAO_EC_Default_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Chan return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x011) return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->consumer_collection_ == 0x012) return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, @@ -792,12 +792,12 @@ TAO_EC_Default_Factory::create_proxy_push_supplier_collection (TAO_EC_Event_Chan return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x001) return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x002) return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, @@ -812,12 +812,12 @@ TAO_EC_Default_Factory::create_proxy_push_supplier_collection (TAO_EC_Event_Chan return new TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x011) return new TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); else if (this->supplier_collection_ == 0x012) return new TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, @@ -884,9 +884,9 @@ TAO_EC_Default_Factory::create_consumer_lock (void) if (this->consumer_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; else if (this->consumer_lock_ == 1) - return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); else if (this->consumer_lock_ == 2) - return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); return 0; } @@ -902,9 +902,9 @@ TAO_EC_Default_Factory::create_supplier_lock (void) if (this->supplier_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; else if (this->supplier_lock_ == 1) - return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); else if (this->supplier_lock_ == 2) - return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> (); + return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); return 0; } @@ -1032,11 +1032,11 @@ template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_EC_ProxyPushSupplier>; template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_List_Iterator, @@ -1078,11 +1078,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_RB_Tree_Iterator, @@ -1125,11 +1125,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_List_Iterator, @@ -1171,11 +1171,11 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_RB_Tree_Iterator, @@ -1218,19 +1218,19 @@ template class TAO_ESF_Shutdown_Command< template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_List_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Read_Guard< TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class TAO_ESF_Copy_On_Write_Write_Guard< TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, TAO_EC_Consumer_List_Iterator, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index f1d15c62827..9ca2612815c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -116,10 +116,10 @@ TAO_EC_Push_Command::execute (CORBA::Environment& ACE_TRY_ENV) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >; +template class ACE_Locked_Data_Block<ACE_Lock_Adapter<TAO_SYNCH_MUTEX> >; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> > +#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<TAO_SYNCH_MUTEX> > #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index a84aa3995fc..5d2c9510957 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -66,7 +66,7 @@ private: ACE_Allocator *allocator_; /// Helper data structure to minimize memory allocations... - ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> > data_block_; + ACE_Locked_Data_Block<ACE_Lock_Adapter<TAO_SYNCH_MUTEX> > data_block_; /// The queue TAO_EC_Queue the_queue_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 2edec1c6e36..630b85d616a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -72,7 +72,7 @@ TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->init_i (rmt_ec, lcl_ec, ACE_TRY_ENV); } @@ -94,7 +94,7 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, void TAO_EC_Gateway_IIOP::close (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->close_i (ACE_TRY_ENV); } @@ -151,7 +151,7 @@ TAO_EC_Gateway_IIOP::update_consumer ( if (c_qos.dependencies.length () <= 1) return; - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->busy_count_ != 0) { @@ -396,7 +396,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events, } { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->busy_count_++; } @@ -433,7 +433,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events, } { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->busy_count_--; @@ -449,7 +449,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events, int TAO_EC_Gateway_IIOP::shutdown (CORBA::Environment& ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); this->close_i (ACE_TRY_ENV); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index 615bdd03291..25f04944d38 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -139,7 +139,7 @@ protected: protected: /// Lock to synchronize internal changes - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; /// How many threads are running push() we cannot make changes until /// that reaches 0 diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index b60270142dd..1704b9adf26 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -23,7 +23,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, const char* rmt_name, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->init_i (rmt_ec, lcl_ec, ACE_TRY_ENV); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp index 7ab82780cc8..f18ccc36d93 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp @@ -1217,32 +1217,32 @@ TAO_ECG_Mcast_EH::Observer::update_supplier ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX,CORBA::ULong>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX,CORBA::ULong>; -template class ACE_Hash_Map_Manager<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, TAO_SYNCH_MUTEX>; template class ACE_Hash_Map_Entry<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*>; template class ACE_Hash<TAO_ECG_UDP_Request_Index>; template class ACE_Equal_To<TAO_ECG_UDP_Request_Index>; -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, TAO_SYNCH_MUTEX>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX,CORBA::ULong> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX,CORBA::ULong> -#pragma instantiate ACE_Hash_Map_Manager<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, TAO_SYNCH_MUTEX> #pragma instantiate ACE_Hash_Map_Entry<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*> #pragma instantiate ACE_Hash<TAO_ECG_UDP_Request_Index> #pragma instantiate ACE_Equal_To<TAO_ECG_UDP_Request_Index> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ECG_UDP_Request_Index,TAO_ECG_UDP_Request_Entry*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, ACE_Hash<TAO_ECG_UDP_Request_Index>, ACE_Equal_To<TAO_ECG_UDP_Request_Index>, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h index 2bd5c358116..0262262c3ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h @@ -248,7 +248,7 @@ public: private: /// The request id.... - ACE_Atomic_Op<ACE_SYNCH_MUTEX,CORBA::ULong> request_id_generator_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX,CORBA::ULong> request_id_generator_; /// The datagram.... ACE_SOCK_Dgram dgram_; @@ -493,7 +493,7 @@ private: typedef ACE_Hash_Map_Manager<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*, - ACE_SYNCH_MUTEX> Request_Map; + TAO_SYNCH_MUTEX> Request_Map; typedef ACE_Hash_Map_Entry<TAO_ECG_UDP_Request_Index, TAO_ECG_UDP_Request_Entry*> Request_Map_Entry; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index aee0c5db1d1..abeeba51cf9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -24,7 +24,7 @@ TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, void TAO_EC_MT_Dispatching::activate (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->active_ != 0) return; @@ -51,7 +51,7 @@ TAO_EC_MT_Dispatching::activate (void) void TAO_EC_MT_Dispatching::shutdown (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->active_ == 0) return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index 439c609bcf6..44ea2f5fa4a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -81,7 +81,7 @@ private: TAO_EC_Dispatching_Task task_; /// Synchronize access to internal data - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; /// Are the threads running? int active_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 78141e2bc4e..a817c0fedce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -40,7 +40,7 @@ TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter (void) void TAO_EC_Per_Supplier_Filter::bind (TAO_EC_ProxyPushConsumer* consumer) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->consumer_ != 0) return; @@ -51,7 +51,7 @@ TAO_EC_Per_Supplier_Filter::bind (TAO_EC_ProxyPushConsumer* consumer) void TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->consumer_ == 0 || this->consumer_ != consumer) return; @@ -74,7 +74,7 @@ void TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->consumer_ == 0) return; @@ -112,7 +112,7 @@ void TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->consumer_ == 0) return; @@ -170,7 +170,7 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, // disconnected. // @@ This lock could be optimized if we knew that the // scheduling strategy is trivial... - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->consumer_ == 0) return; @@ -197,7 +197,7 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, CORBA::ULong TAO_EC_Per_Supplier_Filter::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); this->refcnt_++; return this->refcnt_; @@ -207,7 +207,7 @@ CORBA::ULong TAO_EC_Per_Supplier_Filter::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); this->refcnt_--; if (this->refcnt_ != 0) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index 2dfb9c95c1e..8bde52ff087 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -77,7 +77,7 @@ private: CORBA::ULong refcnt_; /// Locking - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp index ae15bb3aa32..0d8e97cb479 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp @@ -42,7 +42,7 @@ TAO_EC_Event_Set::_create (RtecEventComm::EventSet& event_set) CORBA::ULong TAO_EC_Event_Set::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); return this->refcnt_++; } @@ -50,7 +50,7 @@ CORBA::ULong TAO_EC_Event_Set::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); this->refcnt_--; if (this->refcnt_ != 0) return this->refcnt_; diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h index 9c66ad3dd78..d0883c9741e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h @@ -77,7 +77,7 @@ private: RtecEventComm::Event* buffer_; // The buffer. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Synchronize access to the class internals. CORBA::ULong refcnt_; diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp index 9b0da7996b3..a3780ab8ec9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.cpp @@ -30,7 +30,7 @@ template class ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>; template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex>; template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >; template class ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX>; -template class ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX>; +template class ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,TAO_SYNCH_MUTEX>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -38,6 +38,6 @@ template class ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX>; #pragma instantiate ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> #pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex> #pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> > -#pragma instantiate ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h index 9b1edab3f44..a707a70341c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h +++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h @@ -34,7 +34,7 @@ #else // Use the same object for each thread. Therefore, we have to use // real synchronization. - typedef ACE_Thread_Mutex ACE_MEMORY_POOL_MUTEX; + typedef TAO_SYNCH_MUTEX ACE_MEMORY_POOL_MUTEX; #endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION || !ACE_HAS_THREADS */ typedef char @@ -57,7 +57,7 @@ public: // ************************************************************ -typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> ACE_ES_Event_Allocator; +typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL, TAO_SYNCH_MUTEX> ACE_ES_Event_Allocator; class TAO_RTOLDEvent_Export ACE_ES_Memory_Pools // = TITLE @@ -76,7 +76,7 @@ public: static void *new_Dispatch_Request (void); static void delete_Dispatch_Request (void *); - typedef ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,ACE_SYNCH_MUTEX> Dispatch_Request_; + typedef ACE_Singleton<ACE_ES_Dispatch_Request_Allocator,TAO_SYNCH_MUTEX> Dispatch_Request_; }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index 7f6c445b5b5..5269eff7131 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -83,14 +83,14 @@ const u_long ACE_Scheduler_MIN_SUB_PRIORITY = ACE_Message_Block::MB_NORMAL; #if defined(TAO_EC_USE_RECURSIVE_MUTEX) -typedef ACE_SYNCH_RECURSIVE_MUTEX ACE_ES_MUTEX; +typedef TAO_SYNCH_RECURSIVE_MUTEX ACE_ES_MUTEX; typedef ACE_Guard<ACE_ES_RECURSIVE_MUTEX> ACE_ES_GUARD; #else -typedef ACE_SYNCH_MUTEX ACE_ES_MUTEX; +typedef TAO_SYNCH_MUTEX ACE_ES_MUTEX; typedef ACE_Guard<ACE_ES_MUTEX> ACE_ES_GUARD; #endif -typedef ACE_SYNCH_RW_MUTEX ACE_ES_RW_LOCK; +typedef TAO_SYNCH_RW_MUTEX ACE_ES_RW_LOCK; typedef ACE_Write_Guard<ACE_ES_RW_LOCK> ACE_ES_WGUARD; typedef ACE_Read_Guard<ACE_ES_RW_LOCK> ACE_ES_RGUARD; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp index 37acf0d0490..696af20d676 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp @@ -17,7 +17,7 @@ TAO_LB_Minimum_Dispersion_Strategy::TAO_LB_Minimum_Dispersion_Strategy (void) TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); @@ -41,7 +41,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) { for ( ; ; ) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, CORBA::Object::_nil ()); @@ -73,9 +73,9 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) proxy->replica (); { - ACE_Reverse_Lock<ACE_SYNCH_MUTEX> reverse_lock (this->lock_); + ACE_Reverse_Lock<TAO_SYNCH_MUTEX> reverse_lock (this->lock_); - ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>, + ACE_GUARD_RETURN (ACE_Reverse_Lock<TAO_SYNCH_MUTEX>, reverse_guard, reverse_lock, CORBA::Object::_nil ()); @@ -109,7 +109,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) int TAO_LB_Minimum_Dispersion_Strategy::insert (TAO_LB_ReplicaProxy *proxy) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1)); @@ -120,7 +120,7 @@ TAO_LB_Minimum_Dispersion_Strategy::insert (TAO_LB_ReplicaProxy *proxy) int TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1)); @@ -135,7 +135,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy, int send_load_advisory = 0; { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h index bd78e0acc1f..fcf0b686ae3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h @@ -67,7 +67,7 @@ private: TAO_LB_ReplicaProxySet proxies_; // Set containing the ReplicaProxy servants. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock used to ensure atomic access to state retained by this // class. }; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp index 9e7bbff3759..8dc15cbde74 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp @@ -43,7 +43,7 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); @@ -69,7 +69,7 @@ TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h index 68e8245a2b1..a4f60a41a06 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h @@ -102,7 +102,7 @@ private: private: - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Mutex used to ensure access ReplicaProxy state is atomic. CORBA::Object_var replica_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp index b537a3d572c..9c0c198c5d0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp @@ -18,7 +18,7 @@ TAO_LB_Round_Robin_Strategy::TAO_LB_Round_Robin_Strategy (void) TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); @@ -42,7 +42,7 @@ CORBA::Object_ptr TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, CORBA::Object::_nil ()); @@ -86,7 +86,7 @@ TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) int TAO_LB_Round_Robin_Strategy::insert (TAO_LB_ReplicaProxy *proxy) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1)); @@ -99,7 +99,7 @@ TAO_LB_Round_Robin_Strategy::insert (TAO_LB_ReplicaProxy *proxy) int TAO_LB_Round_Robin_Strategy::remove (TAO_LB_ReplicaProxy *proxy) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1)); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h index 8abedbc2edb..523ff488d9e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h @@ -71,7 +71,7 @@ private: ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> next_replica_; - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock used to ensure access to state within this class is atomic. }; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index c8562e77eb2..9828cdae2ff 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -102,23 +102,23 @@ LogMgr_i::remove (DsLogAdmin::LogId id) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash_Map_Entry<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var>; -template class ACE_Hash_Map_Manager<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Hash_Map_Entry<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var>; -#pragma instantiate ACE_Hash_Map_Manager<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Manager_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Manager<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Manager_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>; #endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index dbc6b31db9b..a3f0d8adf96 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -69,7 +69,7 @@ public: protected: typedef ACE_Hash_Map_Manager <DsLogAdmin::LogId, - DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX> HASHMAP; + DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX> HASHMAP; // Define the HASHMAP. HASHMAP hash_map_; diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp index 37acf0d0490..696af20d676 100644 --- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp +++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp @@ -17,7 +17,7 @@ TAO_LB_Minimum_Dispersion_Strategy::TAO_LB_Minimum_Dispersion_Strategy (void) TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); @@ -41,7 +41,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) { for ( ; ; ) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, CORBA::Object::_nil ()); @@ -73,9 +73,9 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) proxy->replica (); { - ACE_Reverse_Lock<ACE_SYNCH_MUTEX> reverse_lock (this->lock_); + ACE_Reverse_Lock<TAO_SYNCH_MUTEX> reverse_lock (this->lock_); - ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>, + ACE_GUARD_RETURN (ACE_Reverse_Lock<TAO_SYNCH_MUTEX>, reverse_guard, reverse_lock, CORBA::Object::_nil ()); @@ -109,7 +109,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) int TAO_LB_Minimum_Dispersion_Strategy::insert (TAO_LB_ReplicaProxy *proxy) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1)); @@ -120,7 +120,7 @@ TAO_LB_Minimum_Dispersion_Strategy::insert (TAO_LB_ReplicaProxy *proxy) int TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1)); @@ -135,7 +135,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy, int send_load_advisory = 0; { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h index bd78e0acc1f..fcf0b686ae3 100644 --- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h @@ -67,7 +67,7 @@ private: TAO_LB_ReplicaProxySet proxies_; // Set containing the ReplicaProxy servants. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock used to ensure atomic access to state retained by this // class. }; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index c46ba41c832..53675ab9e5c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -13,7 +13,7 @@ template <class ITERATOR, class TABLE_ENTRY> TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (TAO_Hash_Naming_Context *context, ITERATOR *hash_iter, PortableServer::POA_ptr poa, - ACE_SYNCH_RECURSIVE_MUTEX &lock) + TAO_SYNCH_RECURSIVE_MUTEX &lock) : destroyed_ (0), context_ (context), hash_iter_ (hash_iter), @@ -57,7 +57,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b b = binding; - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -111,7 +111,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); // Obtain the lock. - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -170,7 +170,7 @@ template <class ITERATOR, class TABLE_ENTRY> void TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 7dce456a5b4..66cbea7d01e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -54,7 +54,7 @@ public: TAO_Bindings_Iterator (TAO_Hash_Naming_Context *context, ITERATOR *hash_iter, PortableServer::POA_ptr poa, - ACE_SYNCH_RECURSIVE_MUTEX &lock); + TAO_SYNCH_RECURSIVE_MUTEX &lock); // Constructor expects a pointer to a // dynamically allocated hash map iterator (destructor // deallocates hash map iterator). @@ -112,7 +112,7 @@ private: ITERATOR *hash_iter_; // A pointer to the hash map iterator. - ACE_SYNCH_RECURSIVE_MUTEX &lock_; + TAO_SYNCH_RECURSIVE_MUTEX &lock_; // Lock passed on from Naming Context to serialize access to the // internal data structure. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 4938831be5a..0bce54e23c8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -111,7 +111,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); ACE_CHECK; @@ -165,7 +165,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); ACE_CHECK; @@ -221,7 +221,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); ACE_CHECK; @@ -279,7 +279,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); ACE_CHECK; @@ -334,7 +334,7 @@ CORBA::Object_ptr TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -428,7 +428,7 @@ void TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); ACE_CHECK; @@ -474,7 +474,7 @@ CosNaming::NamingContext_ptr TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -519,7 +519,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n, void TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 62826d54c09..5002530994b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -208,7 +208,7 @@ protected: // all client CosNaming::NamingContext CORBA calls. // We need this pointer for reference counting. - ACE_SYNCH_RECURSIVE_MUTEX lock_; + TAO_SYNCH_RECURSIVE_MUTEX lock_; // Lock used to serialize access to the underlying data structure. int destroyed_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 66d99a2d925..7e563a5e3c6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -40,7 +40,7 @@ template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_With_Allocator<TAO_Persistent_Ind int TAO_Persistent_Context_Index::unbind (const char *poa_id) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); TAO_Persistent_Index_ExtId name (poa_id); TAO_Persistent_Index_IntId entry; @@ -59,7 +59,7 @@ TAO_Persistent_Context_Index::bind (const char *poa_id, ACE_UINT32 *&counter, TAO_Persistent_Context_Index::CONTEXT *hash_map) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); // Allocate memory for items to be stored in the table. size_t poa_id_len = ACE_OS::strlen (poa_id) + 1; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index 42a12062aac..94808f86f02 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -52,7 +52,7 @@ public: TAO_Persistent_IntId> CONTEXT; // Hash map used by Persistent Naming Context to keep its state. - typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> + typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, TAO_SYNCH_MUTEX> > ALLOCATOR; // Allocator we will be using to make the Naming Service persistent. @@ -119,7 +119,7 @@ private: // Helper for <create_index> method: places hash table into an // allocated space. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock to prevent multiple threads from modifying entries in the // <index_> simultanneously. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index e2ddaf6eccc..41edb44f3f7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -392,7 +392,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, CosNaming::NamingContext_ptr TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -437,7 +437,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, ACE_CHECK; // Obtain a lock before we proceed with the operation. - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 1984692283d..57782b697fb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -193,7 +193,7 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, CosNaming::NamingContext_ptr TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -238,7 +238,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, ACE_CHECK; // Obtain a lock before we proceed with the operation. - ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp index b80b3b4e9c9..e160f649712 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp @@ -102,10 +102,10 @@ TAO_Notify_AdminProperties::queue_full (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX,int>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX,int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX,int> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX,int> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h index c29e89bb4ed..43172179ecb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h @@ -28,7 +28,7 @@ #include "Notify_Listeners.h" #include "notify_export.h" -typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX,CORBA::Long> TAO_Notify_Property_Long; +typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX,CORBA::Long> TAO_Notify_Property_Long; class TAO_Notify_Export TAO_Notify_AdminProperties { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 0dcf559d4ad..3f5d2a69711 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -51,23 +51,23 @@ visit_property (TAO_Property_Constraint* literal) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; template class ACE_Hash_Map_Entry <ACE_CString, const CORBA::Any*>; -template class ACE_Hash_Map_Iterator<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; #pragma instantiate ACE_Hash_Map_Entry <ACE_CString, const CORBA::Any*>; -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>; +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index 5748c525103..256678ec3c9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -40,7 +40,7 @@ class TAO_Notify_Export TAO_Notify_Constraint_Evaluator : public TAO_Constraint_ private: ACE_Hash_Map_Manager <ACE_CString, const CORBA::Any*, - ACE_SYNCH_MUTEX> property_lookup_; + TAO_SYNCH_MUTEX> property_lookup_; // Used to lookup property name and values }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp index d4a44a0727a..f328a199504 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -163,7 +163,7 @@ TAO_Notify_Default_CO_Factory::create_event_channel_lock (CORBA::Environment &AC { ACE_Lock* lock; ACE_NEW_THROW_EX (lock, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (), + ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (), CORBA::NO_MEMORY ()); return lock; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index aa80e6b62e2..7a8c23d97fc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -57,13 +57,13 @@ TAO_Notify_Default_Collection_Factory::create_event_listener_list (CORBA::Enviro new TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, TAO_Notify_EventListener_List_Iterator, - ACE_SYNCH_MUTEX> (); + TAO_SYNCH_MUTEX> (); ACE_NEW_THROW_EX (listener_list, TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, TAO_Notify_EventListener_List_Iterator, - ACE_SYNCH_MUTEX> (), + TAO_SYNCH_MUTEX> (), CORBA::NO_MEMORY ());*/ // TODO: create other kinds of lists. } @@ -76,7 +76,7 @@ TAO_Notify_Default_Collection_Factory::create_update_listener_list (CORBA::Envir new TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, TAO_Notify_UpdateListener_List_Iterator, - ACE_SYNCH_MUTEX> (); // ACE_SYNCH_NULL_MUTEX + TAO_SYNCH_MUTEX> (); // ACE_SYNCH_NULL_MUTEX return listener_list; */ @@ -107,8 +107,8 @@ ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_Collection_Factory) template class TAO_ESF_Worker<TAO_Notify_EventListener>; template class TAO_ESF_Worker<TAO_Notify_UpdateListener>; -template class TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener *>, ACE_SYNCH_MUTEX>; -template class TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, ACE_SYNCH_MUTEX>; +template class TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener *>, TAO_SYNCH_MUTEX>; +template class TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, TAO_SYNCH_MUTEX>; template class TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, ACE_Null_Mutex>; template class TAO_ESF_Copy_On_Write<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener *>, ACE_SYNCH>; @@ -132,17 +132,17 @@ template class TAO_ESF_Proxy_Collection<TAO_Notify_EventListener>; template class TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>; template class TAO_ESF_Proxy_Collection<TAO_Notify_UpdateListener>; -template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener*>, ACE_SYNCH_MUTEX>; +template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener*>, TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener*>, ACE_SYNCH_MUTEX>; +template class TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener*>, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_ESF_Worker<TAO_Notify_EventListener> #pragma instantiate TAO_ESF_Worker<TAO_Notify_UpdateListener> -#pragma instantiate TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener *>, ACE_SYNCH_MUTEX> -#pragma instantiate TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_ESF_Immediate_Changes<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener *>, TAO_SYNCH_MUTEX> +#pragma instantiate TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, TAO_SYNCH_MUTEX> #pragma instantiate TAO_ESF_Immediate_Changes<TAO_Notify_UpdateListener, TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener *>, ACE_Null_Mutex> #pragma instantiate TAO_ESF_Copy_On_Write<TAO_Notify_EventListener, TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener *>, ACE_SYNCH> @@ -167,8 +167,8 @@ TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, #pragma instantiate TAO_ESF_Proxy_List<TAO_Notify_UpdateListener> #pragma instantiate TAO_ESF_Proxy_Collection<TAO_Notify_UpdateListener> -#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener*>, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_EventListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_EventListener*>, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener*>, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_ESF_Copy_On_Write_Read_Guard<TAO_ESF_Proxy_List<TAO_Notify_UpdateListener>, ACE_Unbounded_Set_Iterator<TAO_Notify_UpdateListener*>, TAO_SYNCH_MUTEX> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp index 7e6c8ae9105..bc5b4ca7ebc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp @@ -125,7 +125,7 @@ TAO_Notify_Event::TAO_Notify_Event (void) // stop_time_ (0), timeout_ (0) { - ACE_NEW (lock_, ACE_Lock_Adapter<ACE_SYNCH_MUTEX> ()); + ACE_NEW (lock_, ACE_Lock_Adapter<TAO_SYNCH_MUTEX> ()); } TAO_Notify_Event::~TAO_Notify_Event () diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp index fffa0ca281d..35cdd5e100a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp @@ -37,7 +37,7 @@ void TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV) { ACE_NEW_THROW_EX (this->lock_, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (), + ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (), CORBA::NO_MEMORY ()); // Create members. @@ -155,25 +155,25 @@ TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener, CORBA::Envi #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash_Map_Entry<TAO_Notify_EventType, TAO_Notify_EventListener_List *>; -template class ACE_Hash_Map_Manager<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager<TAO_Notify_EventType, TAO_Notify_EventListener_List *,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator<TAO_Notify_EventType, TAO_Notify_EventListener_List *,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator<TAO_Notify_EventType, TAO_Notify_EventListener_List *,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,TAO_SYNCH_MUTEX>; template class ACE_Hash<TAO_Notify_EventType>; template class ACE_Equal_To<TAO_Notify_EventType>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Hash_Map_Entry<TAO_Notify_EventType, TAO_Notify_EventListener_List *> -#pragma instantiate ACE_Hash_Map_Manager<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager<TAO_Notify_EventType, TAO_Notify_EventListener_List *,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator<TAO_Notify_EventType, TAO_Notify_EventListener_List *,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Notify_EventType, TAO_Notify_EventListener_List *,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Notify_EventType, TAO_Notify_EventListener_List *,ACE_Hash<TAO_Notify_EventType>, ACE_Equal_To<TAO_Notify_EventType>,TAO_SYNCH_MUTEX> #pragma instantiate template ACE_Hash<TAO_Notify_EventType> #pragma instantiate template ACE_Equal_To<TAO_Notify_EventType> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h index 1233c1ee741..d8098afb16a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h @@ -103,7 +103,7 @@ public: protected: // = Typedefs typedef ACE_Hash_Map_Manager <TAO_Notify_EventType, - TAO_Notify_EventListener_List*, ACE_SYNCH_MUTEX> EVENT_RECIPIENT_MAP; + TAO_Notify_EventListener_List*, TAO_SYNCH_MUTEX> EVENT_RECIPIENT_MAP; // = Data Members EVENT_RECIPIENT_MAP event_recipient_map_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp index 466d35e838d..72beefedd0f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp @@ -121,24 +121,24 @@ TAO_Notify_FilterAdmin_i::remove_all_filters ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>; -template class ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX>; template class TAO_Notify_ID_Pool_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::FilterIDSeq>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>; -#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX> #pragma instantiate TAO_Notify_ID_Pool_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::FilterIDSeq> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h index 3a1094ca61f..9f4977b7d04 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h @@ -90,7 +90,7 @@ public: )); private: - typedef ACE_Hash_Map_Manager <CosNotifyFilter::FilterID, CosNotifyFilter::Filter_var, ACE_SYNCH_MUTEX> FILTER_LIST; + typedef ACE_Hash_Map_Manager <CosNotifyFilter::FilterID, CosNotifyFilter::Filter_var, TAO_SYNCH_MUTEX> FILTER_LIST; FILTER_LIST filter_list_; // List of filters diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp index c7d2ccbb5a9..096fd3152ef 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp @@ -420,13 +420,13 @@ CosNotifyFilter::CallbackIDSeq * TAO_Notify_Filter_i::get_callbacks ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr *>; -template class ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,TAO_SYNCH_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,TAO_SYNCH_MUTEX>; template class ACE_Equal_To<CosNotifyFilter::ConstraintID>; @@ -440,13 +440,13 @@ template class ACE_Auto_Basic_Ptr<CosNotifyFilter::ConstraintInfoSeq>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*> -#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_Filter_i::Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,TAO_SYNCH_MUTEX> #pragma instantiate ACE_Array<TAO_Notify_Filter_i::Notify_Constraint_Expr*> #pragma instantiate ACE_Array_Base<TAO_Notify_Filter_i::Notify_Constraint_Expr*> diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h index 61397f2fec7..5656ccf8617 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h @@ -193,13 +193,13 @@ private: ACE_Hash_Map_Manager <CosNotifyFilter::ConstraintID, ACE_NESTED_CLASS (TAO_Notify_Filter_i, Notify_Constraint_Expr*), - ACE_SYNCH_MUTEX> + TAO_SYNCH_MUTEX> constraint_expr_list_; // A list of the constraints stored in this filter. typedef ACE_Hash_Map_Iterator <CosNotifyFilter::ConstraintID, ACE_NESTED_CLASS (TAO_Notify_Filter_i, Notify_Constraint_Expr*), - ACE_SYNCH_MUTEX> + TAO_SYNCH_MUTEX> CONSTRAINT_EXPR_LIST_ITER; typedef ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID, diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp index 9e7bbff3759..8dc15cbde74 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp @@ -43,7 +43,7 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); @@ -69,7 +69,7 @@ TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h index 68e8245a2b1..a4f60a41a06 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h +++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h @@ -102,7 +102,7 @@ private: private: - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Mutex used to ensure access ReplicaProxy state is atomic. CORBA::Object_var replica_; diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp index b537a3d572c..9c0c198c5d0 100644 --- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp @@ -18,7 +18,7 @@ TAO_LB_Round_Robin_Strategy::TAO_LB_Round_Robin_Strategy (void) TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_)); @@ -42,7 +42,7 @@ CORBA::Object_ptr TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, CORBA::Object::_nil ()); @@ -86,7 +86,7 @@ TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) int TAO_LB_Round_Robin_Strategy::insert (TAO_LB_ReplicaProxy *proxy) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1)); @@ -99,7 +99,7 @@ TAO_LB_Round_Robin_Strategy::insert (TAO_LB_ReplicaProxy *proxy) int TAO_LB_Round_Robin_Strategy::remove (TAO_LB_ReplicaProxy *proxy) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, -1)); diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h index 8abedbc2edb..523ff488d9e 100644 --- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h @@ -71,7 +71,7 @@ private: ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> next_replica_; - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock used to ensure access to state within this class is atomic. }; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index e16c7252ff6..f255d8d8fcb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -222,11 +222,11 @@ template class ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CO template class ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>; template class ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>; -template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*>; -template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -241,10 +241,10 @@ template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connectio #pragma instantiate ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_Connector> #pragma instantiate ACE_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler> #pragma instantiate ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> -#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 99404e41e08..3d2ab57182e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -300,11 +300,11 @@ template class ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECT template class ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>; -template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*>; -template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; template class ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -319,11 +319,11 @@ template class ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*>; #pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SOCK_CONNECTOR> #pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Connection_Handler> #pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> -#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 6420e34e303..61761bfd780 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -2412,10 +2412,10 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Map_Entry<ACE_CString, RtecScheduler::RT_Info *>; -template class ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX>; -template class ACE_Map_Iterator_Base<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX>; -template class ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX>; -template class ACE_Map_Reverse_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX>; +template class ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>; +template class ACE_Map_Iterator_Base<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>; +template class ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>; +template class ACE_Map_Reverse_Iterator<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>; template class ACE_DNode<Dispatch_Entry_Link>; template class ACE_DNode<Dispatch_Proxy_Iterator *>; template class ACE_DNode<TimeLine_Entry_Link>; @@ -2441,10 +2441,10 @@ template class ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *>; template class ACE_Unbounded_Set_Iterator<RtecScheduler::Scheduling_Anomaly *>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Map_Entry<ACE_CString, RtecScheduler::RT_Info *> -#pragma instantiate ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX> #pragma instantiate ACE_DNode<Dispatch_Entry_Link> #pragma instantiate ACE_DNode<Dispatch_Proxy_Iterator *> #pragma instantiate ACE_DNode<TimeLine_Entry_Link> diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index 29220b1d687..38f877f9e20 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -380,15 +380,15 @@ private: typedef RT_Info *INT; #if defined (ACE_HAS_THREADS) - typedef ACE_Thread_Mutex SYNCH; - typedef ACE_Recursive_Thread_Mutex LOCK; + typedef TAO_SYNCH_MUTEX SYNCH; + typedef TAO_SYNCH_RECURSIVE_MUTEX LOCK; #else typedef ACE_Null_Mutex SYNCH; typedef ACE_Null_Mutex LOCK; #endif /* ACE_HAS_THREADS */ - typedef ACE_Map_Manager<EXT, INT, ACE_SYNCH_MUTEX> Info_Collection; - typedef ACE_Map_Iterator<EXT, INT, ACE_SYNCH_MUTEX> Info_Collection_Iterator; + typedef ACE_Map_Manager<EXT, INT, TAO_SYNCH_MUTEX> Info_Collection; + typedef ACE_Map_Iterator<EXT, INT, TAO_SYNCH_MUTEX> Info_Collection_Iterator; typedef ACE_Map_Entry<EXT, INT> Info_Collection_Entry; ////////////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 7d615e0e0e4..eee2a33502e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -279,26 +279,26 @@ ACE_Scheduler::dispatch_configuration (const Preemption_Priority & p_priority, #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Map_Entry<ACE_CString, ACE_Scheduler::RT_Info **>; -template class ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX>; +template class ACE_Lock_Adapter<TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Manager<ACE_CString, ACE_Scheduler::RT_Info **, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class ACE_Map_Iterator_Base<ACE_CString, ACE_Scheduler::RT_Info **, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class ACE_Map_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; template class ACE_Map_Reverse_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, - ACE_SYNCH_MUTEX>; + TAO_SYNCH_MUTEX>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Map_Entry<ACE_CString, ACE_Scheduler::RT_Info **> -#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Manager<ACE_CString, ACE_Scheduler::RT_Info **, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, ACE_Scheduler::RT_Info **, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Lock_Adapter<TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Manager<ACE_CString, ACE_Scheduler::RT_Info **, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, ACE_Scheduler::RT_Info **, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index 86ebf429fed..97dd4df1fed 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -263,8 +263,8 @@ private: typedef ACE_CString EXT; typedef RT_Info **INT; - typedef ACE_Map_Manager<EXT, INT, ACE_SYNCH_MUTEX> Info_Collection; - typedef ACE_Map_Iterator<EXT, INT, ACE_SYNCH_MUTEX> Info_Collection_Iterator; + typedef ACE_Map_Manager<EXT, INT, TAO_SYNCH_MUTEX> Info_Collection; + typedef ACE_Map_Iterator<EXT, INT, TAO_SYNCH_MUTEX> Info_Collection_Iterator; typedef ACE_Map_Entry<EXT, INT> Info_Collection_Entry; Info_Collection info_collection_; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index 1ba089017a8..f8ed3a7204a 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -102,7 +102,7 @@ private: // dispatchin configuration info #if defined (ACE_HAS_THREADS) - typedef ACE_Recursive_Thread_Mutex LOCK; + typedef TAO_SYNCH_RECURSIVE_MUTEX LOCK; #else typedef ACE_Null_Mutex LOCK; #endif /* ACE_HAS_THREADS */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp index 96470138d19..44a07b258d1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp @@ -2,7 +2,7 @@ #include "Interpreter.h" -ACE_SYNCH_MUTEX TAO_Interpreter::parserMutex__; +TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__; TAO_Interpreter::TAO_Interpreter (void) : root_ (0) @@ -17,7 +17,7 @@ TAO_Interpreter::~TAO_Interpreter (void) int TAO_Interpreter::build_tree (const char* constraints) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, TAO_Interpreter::parserMutex__, -1); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index db806cfd225..307b6a28b1e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -49,7 +49,7 @@ protected: // The root of the expression tree, not equal to null if build_tree // successfully builds a tree from the constraints. private: - static ACE_SYNCH_MUTEX parserMutex__; + static TAO_SYNCH_MUTEX parserMutex__; // This mutex protects the <build_tree> method from reentrance. }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 667d525be40..0b4e417702b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -593,7 +593,7 @@ TAO_Trader_Factory::manufacture_trader (void) typedef TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex> TRADER; #if defined ACE_HAS_THREADS - typedef TAO_Trader<ACE_Thread_Mutex, ACE_RW_Thread_Mutex> MT_TRADER; + typedef TAO_Trader<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX> MT_TRADER; #else typedef TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex> MT_TRADER; #endif /* ACE_HAS_THREADS */ @@ -793,24 +793,24 @@ TAO_Trader_Factory::parse_args (int& argc, char** argv) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -template class TAO_Offer_Database<ACE_RW_Thread_Mutex>; -template class TAO_Service_Offer_Iterator<ACE_RW_Thread_Mutex>; -template class TAO_Trader<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>; -template class TAO_Lookup<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>; -template class TAO_Register<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>; -template class TAO_Admin<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>; -template class TAO_Link<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>; -template class TAO_Proxy<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>; -template class TAO_Register_Offer_Iterator<ACE_RW_Thread_Mutex>; -template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>; -template class ACE_Hash_Map_Entry<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*>; -template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>; +template class TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>; +template class TAO_Service_Offer_Iterator<TAO_SYNCH_RW_MUTEX>; +template class TAO_Trader<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX>; +template class TAO_Lookup<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX>; +template class TAO_Register<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX>; +template class TAO_Admin<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX>; +template class TAO_Link<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX>; +template class TAO_Proxy<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX>; +template class TAO_Register_Offer_Iterator<TAO_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, TAO_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, TAO_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, TAO_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, TAO_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Entry<TAO_String_Hash_Key,TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*>; +template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>; +template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>; +template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>; #endif /* ACE_MT_SAFE */ template class TAO_Offer_Database<ACE_Null_Mutex>; template class TAO_Service_Offer_Iterator<ACE_Null_Mutex>; @@ -874,24 +874,24 @@ template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Data #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -#pragma instantiate TAO_Register_Offer_Iterator<ACE_RW_Thread_Mutex> -#pragma instantiate TAO_Offer_Database<ACE_RW_Thread_Mutex> -#pragma instantiate TAO_Service_Offer_Iterator<ACE_RW_Thread_Mutex> -#pragma instantiate TAO_Trader<ACE_Thread_Mutex, ACE_RW_Thread_Mutex> -#pragma instantiate TAO_Lookup<ACE_Thread_Mutex, ACE_RW_Thread_Mutex> -#pragma instantiate TAO_Register<ACE_Thread_Mutex, ACE_RW_Thread_Mutex> -#pragma instantiate TAO_Admin<ACE_Thread_Mutex, ACE_RW_Thread_Mutex> -#pragma instantiate TAO_Link<ACE_Thread_Mutex, ACE_RW_Thread_Mutex> -#pragma instantiate TAO_Proxy<ACE_Thread_Mutex, ACE_RW_Thread_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> +#pragma instantiate TAO_Register_Offer_Iterator<TAO_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Offer_Database<TAO_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Service_Offer_Iterator<TAO_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Trader<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Lookup<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Register<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Admin<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Link<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Proxy<TAO_SYNCH_MUTEX, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*> +#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<TAO_SYNCH_RW_MUTEX>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> #endif /* ACE_MT_SAFE */ #pragma instantiate TAO_Offer_Database<ACE_Null_Mutex> #pragma instantiate TAO_Service_Offer_Iterator<ACE_Null_Mutex> diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp index 225bf115633..9044d2dc367 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp @@ -188,7 +188,7 @@ ttcp_Stream_Handler::handle_input (ACE_HANDLE /* handle */) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<Server_Globals,ACE_SYNCH_MUTEX>; +template class ACE_Singleton<Server_Globals,TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton <Server_Globals,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton <Server_Globals,TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child.h b/TAO/orbsvcs/tests/AVStreams/benchmark/child.h index 19cd6a3d6e5..c98f0f0ac15 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/child.h +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child.h @@ -43,10 +43,10 @@ public: // ready flag used by the high priority thread to wake up the low // priority threads after it's parsed the arguments. - ACE_SYNCH_MUTEX ready_mtx_; + TAO_SYNCH_MUTEX ready_mtx_; // mutex for the condition variable. - ACE_SYNCH_CONDITION ready_cond_; + TAO_SYNCH_CONDITION ready_cond_; // condition variable for the low priority threads to wait //until the high priority thread is done with the arguments parsing. @@ -65,7 +65,7 @@ public: // The process options for the process to be spawned by the process strategy }; -typedef ACE_Singleton <Server_Globals,ACE_SYNCH_MUTEX> SERVER_GLOBALS; +typedef ACE_Singleton <Server_Globals,TAO_SYNCH_MUTEX> SERVER_GLOBALS; class ttcp_Stream_Handler : public virtual ACE_Event_Handler diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp index 8b425c05c67..7d36af990c8 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp @@ -204,7 +204,7 @@ Client::svc (void) { if (this->task_id_ == 0) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, 1)); + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, 1)); ACE_NEW_RETURN (GLOBALS::instance ()->barrier_, ACE_Barrier (GLOBALS::instance ()->thread_count_), @@ -214,7 +214,7 @@ Client::svc (void) } else { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, 1)); + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, 1)); GLOBALS::instance ()->ready_cond_.wait (); } @@ -513,12 +513,12 @@ template class TAO_AV_Endpoint_Reactive_Strategy<Client_StreamEndPoint,TAO_VDev, template class TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; template class TAO_AV_Endpoint_Reactive_Strategy_A<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; template class ACE_Acceptor <ttcp_Client_StreamEndPoint,ACE_SOCK_ACCEPTOR>; -template class ACE_Singleton<Globals,ACE_SYNCH_MUTEX>; +template class ACE_Singleton<Globals,TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #pragma instantiate ACE_Acceptor <ttcp_Client_StreamEndPoint,ACE_SOCK_ACCEPTOR> -#pragma instantiate ACE_Singleton <Globals,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton <Globals,TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.h b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h index 7cd84ea8431..8f9dcf0bf51 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.h +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h @@ -138,10 +138,10 @@ public: // ready flag used by the high priority thread to wake up the low // priority threads after it's parsed the arguments. - ACE_SYNCH_MUTEX ready_mtx_; + TAO_SYNCH_MUTEX ready_mtx_; // mutex for the condition variable. - ACE_SYNCH_CONDITION ready_cond_; + TAO_SYNCH_CONDITION ready_cond_; // condition variable for the low priority threads to wait //until the high priority thread is done with the arguments parsing. @@ -166,7 +166,7 @@ public: // No. of threads. }; -typedef ACE_Singleton <Globals,ACE_SYNCH_MUTEX> GLOBALS; +typedef ACE_Singleton <Globals,TAO_SYNCH_MUTEX> GLOBALS; class Client : public ACE_Task<ACE_SYNCH> // one of these per client thread diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp index 125565cd85f..431c582cc2b 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.cpp @@ -159,9 +159,9 @@ Audio_Control_Play_State::close (void) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<Audio_Control_Play_State, ACE_Thread_Mutex>; -template class ACE_Singleton<Audio_Control_Waiting_State, ACE_Thread_Mutex>; +template class ACE_Singleton<Audio_Control_Play_State, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Audio_Control_Waiting_State, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<Audio_Control_Play_State, ACE_Thread_Mutex> -#pragma instantiate ACE_Singleton<Audio_Control_Waiting_State, ACE_Thread_Mutex> +#pragma instantiate ACE_Singleton<Audio_Control_Play_State, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Audio_Control_Waiting_State, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h index e585f00f01b..173f8897e98 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_State.h @@ -76,9 +76,9 @@ public: virtual void close (void); }; -typedef ACE_Singleton <Audio_Control_Waiting_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Audio_Control_Waiting_State, TAO_SYNCH_MUTEX> AUDIO_CONTROL_WAITING_STATE; -typedef ACE_Singleton <Audio_Control_Play_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Audio_Control_Play_State, TAO_SYNCH_MUTEX> AUDIO_CONTROL_PLAY_STATE; #endif /*_MPEG_AUDIO_CONTROL_STATE_H */ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp index 05eea8d2e0c..7f792d32392 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp @@ -2950,9 +2950,9 @@ Audio_Global::on_exit_routine(void) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<Video_Global, ACE_Thread_Mutex>; -template class ACE_Singleton<Audio_Global, ACE_Thread_Mutex>; +template class ACE_Singleton<Video_Global, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Audio_Global, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<Video_Global, ACE_Thread_Mutex> -#pragma instantiate ACE_Singleton<Audio_Global, ACE_Thread_Mutex> +#pragma instantiate ACE_Singleton<Video_Global, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Audio_Global, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h index c7740c4ccda..9eba48df67d 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h @@ -302,7 +302,7 @@ public: int init_video (void); }; -typedef ACE_Singleton <Video_Global, ACE_SYNCH_MUTEX> VIDEO_SINGLETON; +typedef ACE_Singleton <Video_Global, TAO_SYNCH_MUTEX> VIDEO_SINGLETON; class Video_Timer_Global // A class that holds the static timer variables defined in the middle @@ -392,7 +392,7 @@ public: AudioFeedBackPara * fbpara ; }; -typedef ACE_Singleton <Audio_Global,ACE_SYNCH_MUTEX> AUDIO_GLOBAL; +typedef ACE_Singleton <Audio_Global,TAO_SYNCH_MUTEX> AUDIO_GLOBAL; #endif /* define MPEG_GLOBAL_H */ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp index ca956749958..72141455745 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp @@ -486,13 +486,13 @@ Video_Control_Fast_Backward_State::close (void) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<Video_Control_Play_State, ACE_Thread_Mutex>; -template class ACE_Singleton<Video_Control_Fast_Forward_State, ACE_Thread_Mutex>; -template class ACE_Singleton<Video_Control_Fast_Backward_State, ACE_Thread_Mutex>; -template class ACE_Singleton<Video_Control_Waiting_State, ACE_Thread_Mutex>; +template class ACE_Singleton<Video_Control_Play_State, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Video_Control_Fast_Forward_State, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Video_Control_Fast_Backward_State, TAO_SYNCH_MUTEX>; +template class ACE_Singleton<Video_Control_Waiting_State, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<Video_Control_Fast_Backward_State, ACE_Thread_Mutex> -#pragma instantiate ACE_Singleton<Video_Control_Play_State, ACE_Thread_Mutex> -#pragma instantiate ACE_Singleton<Video_Control_Fast_Forward_State, ACE_Thread_Mutex> -#pragma instantiate ACE_Singleton<Video_Control_Waiting_State, ACE_Thread_Mutex> +#pragma instantiate ACE_Singleton<Video_Control_Fast_Backward_State, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Video_Control_Play_State, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Video_Control_Fast_Forward_State, TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Singleton<Video_Control_Waiting_State, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h index 9363a48ea0d..389d1a68230 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h @@ -177,13 +177,13 @@ public: CORBA::Boolean stop (CORBA::Long cmdsn); }; -typedef ACE_Singleton <Video_Control_Waiting_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Video_Control_Waiting_State, TAO_SYNCH_MUTEX> VIDEO_CONTROL_WAITING_STATE; -typedef ACE_Singleton <Video_Control_Play_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Video_Control_Play_State, TAO_SYNCH_MUTEX> VIDEO_CONTROL_PLAY_STATE; -typedef ACE_Singleton <Video_Control_Fast_Forward_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Video_Control_Fast_Forward_State, TAO_SYNCH_MUTEX> VIDEO_CONTROL_FAST_FORWARD_STATE; -typedef ACE_Singleton <Video_Control_Fast_Backward_State, ACE_SYNCH_MUTEX> +typedef ACE_Singleton <Video_Control_Fast_Backward_State, TAO_SYNCH_MUTEX> VIDEO_CONTROL_FAST_BACKWARD_STATE; #endif /* MPEG_VIDEO_SERVER_STATE_H */ diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index 24db133161d..3c2ce9101f3 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -353,7 +353,7 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin, { CosEventChannelAdmin::ProxyPushSupplier_var proxy; { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) { @@ -374,7 +374,7 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin, void RND_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; @@ -406,7 +406,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin, { CosEventChannelAdmin::ProxyPushConsumer_var proxy; { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) { @@ -433,7 +433,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin, void RND_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; @@ -459,7 +459,7 @@ RND_Supplier::push (CORBA::Any &event, { CosEventChannelAdmin::ProxyPushConsumer_var proxy; { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index 051263bd3c9..3a113cdee5a 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -64,7 +64,7 @@ protected: CosEventChannelAdmin::ProxyPushSupplier_var proxy_; // The supplier. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Synch }; @@ -127,7 +127,7 @@ private: CosEventChannelAdmin::ProxyPushConsumer_var proxy_; // The supplier. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Synch }; diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp index 6a3d7fb3dd5..f6526df1daa 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp @@ -243,7 +243,7 @@ CEC_Counting_Consumer_Task::svc () void CEC_Counting_Consumer_Task::stop (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->stop_flag_ = 1; } @@ -280,7 +280,7 @@ CEC_Counting_Consumer_Task::run (CORBA::Environment &ACE_TRY_ENV) if (has_event) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->pull_count_++; } diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index 012325965f2..10c921c6693 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h @@ -149,7 +149,7 @@ private: // If not zero then pause for <milliseconds> before sending each // event. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; }; #endif /* ECT_CONSUMER_H */ diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp index f664dbcfaaa..774f3177df8 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp @@ -109,7 +109,7 @@ CEC_Counting_Supplier_Task::svc () void CEC_Counting_Supplier_Task::stop (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->stop_flag_ = 1; } @@ -141,7 +141,7 @@ CEC_Counting_Supplier_Task::run (CORBA::Environment &ACE_TRY_ENV) ACE_OS::sleep (0); } - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->push_count_++; diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h index 159e77205f8..357714a81d5 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h @@ -96,7 +96,7 @@ private: // If not zero then pause for <milliseconds> before sending each // event. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; }; // **************************************************************** diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 02060df5e7b..7b9dca0b336 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -188,7 +188,7 @@ Driver::push_consumer (void* /* consumer_cookie */, return; } - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->recv_count_mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->recv_count_mutex_); this->recv_count_ += events.length (); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index 62b9bdca96f..49f0925df86 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h @@ -110,7 +110,7 @@ private: const char* pid_file_name_; // The name of a file where the process stores its pid - ACE_SYNCH_MUTEX recv_count_mutex_; + TAO_SYNCH_MUTEX recv_count_mutex_; int recv_count_; // How many events we have received. }; diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index 082e778860a..9490a558de5 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -496,7 +496,7 @@ private: ECM_Federation* all_federations_[MAX_FEDERATIONS]; // All the federations. - ACE_Atomic_Op<ACE_SYNCH_MUTEX,CORBA::ULong> federations_running_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX,CORBA::ULong> federations_running_; // Keep track of how many federations are active so we can shutdown // once they are all destroyed. diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 79d0ee8a7aa..af62cfd60bc 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -542,7 +542,7 @@ Test_ECG::run (int argc, char* argv[]) // Acquire the mutex for the ready mutex, blocking any supplier // that may start after this point. - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, this->ready_mtx_, 1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, this->ready_mtx_, 1); this->ready_ = 1; this->test_start_ = ACE_OS::gethrtime (); this->ready_cnd_.broadcast (); @@ -992,7 +992,7 @@ Test_ECG::push_consumer (void *consumer_cookie, void Test_ECG::wait_until_ready (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ready_mon, this->ready_mtx_); + ACE_GUARD (TAO_SYNCH_MUTEX, ready_mon, this->ready_mtx_); while (!this->ready_) this->ready_cnd_.wait (); } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 8b3691ced53..9c9cbd9602a 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -362,17 +362,17 @@ private: // Store the measurements for local and remote events.. int ready_; - ACE_SYNCH_MUTEX ready_mtx_; - ACE_SYNCH_CONDITION ready_cnd_; + TAO_SYNCH_MUTEX ready_mtx_; + TAO_SYNCH_CONDITION ready_cnd_; // Before accepting any events the suppliers must wait for the test // to setup all the consumers. // The suppliers wait on the condition variable. - ACE_Atomic_Op<ACE_SYNCH_MUTEX,int> running_suppliers_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX,int> running_suppliers_; // keep track of how many suppliers are still running so we shutdown // at the right moment. - ACE_Atomic_Op<ACE_SYNCH_MUTEX,int> running_consumers_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX,int> running_consumers_; // keep track of how many consumers are still running so we shutdown // at the right moment. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 03cea69d4f8..217116097ae 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -125,7 +125,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events, return; } - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); // We start the timer as soon as we receive the first event... if (this->recv_count_ == 0) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index f56dc82d7e3..2ebb10be3b8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -79,7 +79,7 @@ private: RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; // We talk to the EC using this proxy. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; int recv_count_; ACE_hrtime_t first_event_; // How many events we have received. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index ddd0e3ff20f..740bc4ecc00 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -172,7 +172,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) ACE_Time_Value tv (0, 10000); this->orb_->perform_work (tv, ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1); if (this->active_count_ <= 0) break; } @@ -211,7 +211,7 @@ ECT_Consumer_Driver::shutdown_consumer (void*, // // ACE_DEBUG ((LM_DEBUG, "(%t) events received by consumer %d\n", ID)); - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->active_count_--; } @@ -222,7 +222,7 @@ ECT_Consumer_Driver::connect_consumers CORBA::Environment &ACE_TRY_ENV) { { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->active_count_ = this->n_consumers_; } for (int i = 0; i < this->n_consumers_; ++i) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index a05a822a151..8c36036a4d0 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -88,7 +88,7 @@ private: CORBA::ORB_var orb_; // A reference to the ORB, to shut it down properly. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; int active_count_; // How many consumers are still receiving events. }; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index d8ad9880905..333a0ab66ab 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -361,7 +361,7 @@ ECT_Throughput::shutdown_consumer (void*, // // ACE_DEBUG ((LM_DEBUG, "(%t) events received by consumer %d\n", ID)); - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->active_count_--; if (this->active_count_ <= 0) { @@ -378,7 +378,7 @@ ECT_Throughput::connect_consumers CORBA::Environment &ACE_TRY_ENV) { { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->active_count_ = this->n_consumers_; } for (int i = 0; i < this->n_consumers_; ++i) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h index 8cf8380cda0..c80c76b7080 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h @@ -120,7 +120,7 @@ private: CORBA::ORB_var orb_; // A reference to the ORB, to shut it down properly. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; int active_count_; // How many consumers are still receiving events. diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 6fb3f5bc377..5b15f1b2667 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -301,7 +301,7 @@ Consumer::push (const RtecEventComm::EventSet& events, return; } - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->event_count++; // ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h index 63179e972b0..11276146cbe 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h @@ -55,7 +55,7 @@ private: int event_base_type_; // Base event type - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Synchronize access to the counter }; diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index 00595268330..0cd5c5e78e2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -185,7 +185,7 @@ Consumer::push (const RtecEventComm::EventSet& events, } { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->event_count++; if (this->event_count != this->shutdown_count_) diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h index cf98b0f2f65..dec0e8f08b9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.h +++ b/TAO/orbsvcs/tests/Event/Basic/Control.h @@ -47,7 +47,7 @@ private: // After this number of events the consumer disconnects from the // event service. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Synchronize access to the counter }; diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 2232e118c0a..d897cad75e8 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -393,7 +393,7 @@ EC_Observer::consumer_push (void*, for (int i = 1; i < this->n_consumers_; ++i) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->consumers_[i]->connected ()) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index de2d4d6f856..5b2fe020327 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -116,7 +116,7 @@ private: TAO_EC_Gateway_IIOP *gwys_; - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // lock internal state }; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index b5498615ca0..75498089811 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -417,7 +417,7 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) { @@ -439,7 +439,7 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, void RND_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; @@ -472,7 +472,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) { @@ -495,7 +495,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, void RND_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; @@ -522,7 +522,7 @@ RND_Supplier::push (RtecEventComm::EventSet &event, { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index ee3b72d351d..9ba7af06e4f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -65,7 +65,7 @@ protected: RtecEventChannelAdmin::ProxyPushSupplier_var proxy_; // The supplier. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Synch }; @@ -129,7 +129,7 @@ private: RtecEventChannelAdmin::ProxyPushConsumer_var proxy_; // The supplier. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Synch int verbose_; diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index fe88fc14a2d..37fab174375 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -121,7 +121,7 @@ main (int argc, char *argv []) // Now create the history ACE_Sample_History history (iterations); - ACE_SYNCH_MUTEX history_mutex; + TAO_SYNCH_MUTEX history_mutex; // The consumer EC_Latency_Consumer consumer (&history, @@ -289,7 +289,7 @@ parse_args (int argc, char *argv[]) // **************************************************************** EC_Latency_Consumer::EC_Latency_Consumer (ACE_Sample_History *history, - ACE_SYNCH_MUTEX *mutex, + TAO_SYNCH_MUTEX *mutex, int message_count) : history_ (history) , mutex_ (mutex) @@ -300,7 +300,7 @@ EC_Latency_Consumer::EC_Latency_Consumer (ACE_Sample_History *history, int EC_Latency_Consumer::done (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, *this->mutex_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_, -1); return this->remaining_messages_ <= 0; } @@ -314,7 +314,7 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events, events[0].header.creation_time); ACE_hrtime_t now = ACE_OS::gethrtime (); - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, *this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); this->history_->sample (now - creation); this->remaining_messages_--; } @@ -349,7 +349,7 @@ Task::Task (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer, int Task::done (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 1); return this->remaining_messages_ == 0; } @@ -375,7 +375,7 @@ Task::svc (void) // ACE_Time_Value tv (0, 5000); // ACE_OS::sleep (tv); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); if (this->remaining_messages_ % 1000 == 0) { ACE_DEBUG ((LM_DEBUG, "Only %d messages to go\n", diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h index 38d8a30d000..e0aa6fa32f1 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.h +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h @@ -33,7 +33,7 @@ class EC_Latency_Consumer : public POA_RtecEventComm::PushConsumer public: /// Constructor EC_Latency_Consumer (ACE_Sample_History *history, - ACE_SYNCH_MUTEX *mutex, + TAO_SYNCH_MUTEX *mutex, int message_count); /// Return 1 when all the messages have been received @@ -50,7 +50,7 @@ private: ACE_Sample_History *history_; /// Use this mutex to synchronize access to history_ - ACE_SYNCH_MUTEX *mutex_; + TAO_SYNCH_MUTEX *mutex_; /// Number of messages yet to be received int remaining_messages_; @@ -92,7 +92,7 @@ private: int remaining_messages_; /// Synchronize access to remaining_messages_ - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; }; #endif /* EC_LATENCY_H */ diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index 7d73fffb9a1..4d664b4baee 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -119,7 +119,7 @@ EC_Consumer::push (const RtecEventComm::EventSet& events, return; } - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->push_count_ == 0) this->throughput_start_ = ACE_OS::gethrtime (); diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index 1e83e9a46b8..ddc4dc35ed9 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -97,7 +97,7 @@ private: RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; // We talk to the EC using this proxy. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Protect internal state ACE_hrtime_t throughput_start_; diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 26ab04bffb6..9642015c566 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -190,7 +190,7 @@ EC_Counting_Supplier_Task::svc () void EC_Counting_Supplier_Task::stop (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->stop_flag_ = 1; } @@ -213,7 +213,7 @@ EC_Counting_Supplier_Task::run (CORBA::Environment &ACE_TRY_ENV) // Sleep for a short time to avoid spinning... ACE_OS::sleep (0); - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->push_count_++; diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index e9bd68f0e5c..ece73ce4db2 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h @@ -124,7 +124,7 @@ private: CORBA::ULong push_count_; // Count the number of push() calls - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; }; #endif /* ECT_SUPPLIER_H */ diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index da43bb46c5a..d682be7d812 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -50,7 +50,7 @@ void EC_Supplier::send_event (const RtecEventComm::EventSet& event, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->push_count_ == 0) this->throughput_start_ = ACE_OS::gethrtime (); diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index aa797d5ca63..d20ca80723c 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -111,7 +111,7 @@ private: void* cookie_; // Magic cookie provided by the supplier to identify ourselves - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Protect the internal state int push_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index 05229f71167..3bda31fd8e4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -326,10 +326,10 @@ main (int argc, char* argv[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h index dde7b393023..95ce40ccad6 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h @@ -101,7 +101,7 @@ protected: TAO_Notify_SequencePushSupplier** sequence_supplier_; // arrays of Suppliers - ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> result_count_; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; // count of clients destroyed. for c consumers, s suppliers and for t times. // this should be (s+c)*t diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp index 1e676908a05..b109cd6410e 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp @@ -305,10 +305,10 @@ main (int argc, char* argv[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h index a7b1d325a51..cf91edeef0d 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h @@ -88,7 +88,7 @@ protected: void create_EC (CORBA::Environment &ACE_TRY_ENV); // Create EC - ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> result_count_; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; // Number of events received so far. int event_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index da6a58fdcd0..a7d8db595ff 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -248,10 +248,10 @@ main (int argc, char* argv[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h index 0bfd8bb5248..3d258388d03 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h @@ -89,7 +89,7 @@ protected: void create_EC (CORBA::Environment &ACE_TRY_ENV); // Create EC - ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> result_count_; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; // Number of events received so far. int event_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index 6cf8264db5f..761ae77bdd2 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -290,10 +290,10 @@ main (int argc, char* argv[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h index d000f7d8f3f..cd65174f53f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h @@ -97,7 +97,7 @@ protected: void create_EC (CORBA::Environment &ACE_TRY_ENV); // Create EC - ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> result_count_; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; // we are waiting for 4 events to happen. const char* domain_name_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index be2744d667c..3f548f1b6ff 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -18,7 +18,7 @@ ACE_RCSID(Notify, RedGreen_Test, "$Id$") #define TYPE_GREEN "TYPE_GREEN" #define TYPE_RED "TYPE_RED" -ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> g_result_count = 0; +ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0; ACE_hrtime_t g_throughput_start_; int @@ -414,7 +414,7 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event (const CosNotificati CosEventComm::Disconnected )) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); const char* domain_name = notification.header.fixed_header.event_type.domain_name; @@ -609,10 +609,10 @@ Worker::svc (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index b8425da72f1..45799cd21e8 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -188,7 +188,7 @@ protected: RedGreen_Test* RedGreen_Test_; // callback <done> - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Protect internal state int push_count_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index bc7ebfc8ada..f762273779b 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -50,7 +50,7 @@ Throughput_StructuredPushConsumer::push_structured_event (const CosNotification: ORBSVCS_Time::TimeT_to_hrtime (Throughput_base, Throughput_base_recorded); - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->push_count_ == 0) this->throughput_start_ = ACE_OS::gethrtime (); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index b6a73178a6c..1c44e247dfc 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -74,7 +74,7 @@ public: protected: Notify_Throughput * test_client_; - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Protect internal state ACE_hrtime_t throughput_start_; @@ -148,7 +148,7 @@ protected: void create_EC (CORBA::Environment &ACE_TRY_ENV); // Create participants. - ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> result_count_; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; // Number of events received so far. CORBA::Boolean colocated_ec_; @@ -186,7 +186,7 @@ protected: Throughput_StructuredPushSupplier** suppliers_; // Suppliers - ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> g_consumer_done_count; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_consumer_done_count; // consumer count; int nthreads_; diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp index 90e81a9e3ab..4fb59c1d299 100644 --- a/TAO/performance-tests/Callback/Callback_i.cpp +++ b/TAO/performance-tests/Callback/Callback_i.cpp @@ -11,7 +11,7 @@ ACE_RCSID(Callback, Callback_i, "$Id$") int Callback_i::done (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->remaining_samples_ == 0; } @@ -21,7 +21,7 @@ Callback_i::response (Test::TimeStamp time_stamp, ACE_THROW_SPEC (()) { ACE_hrtime_t now = ACE_OS::gethrtime (); - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->remaining_samples_ == 0) return; this->remaining_samples_--; diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h index 47ba6ccff2c..e66d1969d98 100644 --- a/TAO/performance-tests/Callback/Callback_i.h +++ b/TAO/performance-tests/Callback/Callback_i.h @@ -28,7 +28,7 @@ public: private: /// Synchronize access to the history data during testing - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; /// Save the history of the latency values ACE_Sample_History history_; diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index 81e6260d7bf..05f06814964 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -39,7 +39,7 @@ private: int remaining_messages_; /// Synchronize access to remaining_messages_ - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; }; int @@ -244,7 +244,7 @@ Task::Task (Test::Server_ptr server, int Task::done (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 1); return this->remaining_messages_ == 0; } @@ -262,7 +262,7 @@ Task::svc (void) // ACE_Time_Value tv (0, 5000); // ACE_OS::sleep (tv); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1); if (this->remaining_messages_ % 1000 == 0) { ACE_DEBUG ((LM_DEBUG, "Only %d messages to go\n", diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp index f79f340d317..8b5ea0b0310 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp @@ -138,7 +138,7 @@ Cubit_Task::initialize_orb (void) ACE_NEW_RETURN (GLOBALS::instance ()->barrier_, ACE_Barrier (GLOBALS::instance ()->num_of_objs + 1), -1); - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, 1)); GLOBALS::instance ()->ready_ = 1; GLOBALS::instance ()->ready_cnd_.broadcast (); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h index 78406f207a5..0d5d4a656c0 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h @@ -32,6 +32,8 @@ #include "ace/Sched_Params.h" #include "ace/Singleton.h" +#include "tao/orbconf.h" + #if defined (VXWORKS) && defined (VME_DRIVER) #define VX_VME_INIT \ STATUS status = vmeDrv ();\ @@ -150,10 +152,10 @@ public: // ready flag used by the high priority thread to wake up the low // priority threads after it's parsed the arguments. - ACE_SYNCH_MUTEX ready_mtx_; + TAO_SYNCH_MUTEX ready_mtx_; // mutex for the condition variable. - ACE_SYNCH_CONDITION ready_cnd_; + TAO_SYNCH_CONDITION ready_cnd_; // condition variable for the low priority threads to wait //until the high priority thread is done with the arguments parsing. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp index e2417cdf99a..c0ce6e19f44 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -297,7 +297,7 @@ Client::put_latency (JITTER_ARRAY *jitter, u_int thread_id, u_int count) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->ts_->lock_)); + ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->ts_->lock_)); this->ts_->latency_[thread_id] = latency; this->ts_->global_jitter_array_[thread_id] = jitter; @@ -599,7 +599,7 @@ Client::init_orb (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "(%t)Arguments parsed successfully\n")); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, this->ts_->ready_mtx_, CORBA::ORB::_nil ()); this->ts_->ready_ = 1; diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h index 13644d1ccbb..332138db27a 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h @@ -141,7 +141,7 @@ public: Cubit_Datatypes datatype_; // Which datatype to use to make the calls. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock to protect access to this object. u_int thread_per_rate_; @@ -216,10 +216,10 @@ public: // ready flag used by the high priority thread to wake up the low // priority threads after it's parsed the arguments. - ACE_SYNCH_MUTEX ready_mtx_; + TAO_SYNCH_MUTEX ready_mtx_; // mutex for the condition variable. - ACE_SYNCH_CONDITION ready_cnd_; + TAO_SYNCH_CONDITION ready_cnd_; // condition variable for the low priority threads to wait //until the high priority thread is done with the arguments parsing. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp index 7c39b63f608..7674e41368e 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp @@ -609,7 +609,7 @@ Client_i::start_servant (void) "(%P|%t) %p\n", "\thigh_priority_task->activate failed")); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ready_mon, GLOBALS::instance ()->ready_mtx_,-1)); + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_,-1)); // Wait on the condition variable till the high priority cubit_task // has finished argument processing. @@ -649,7 +649,7 @@ Client_i::do_priority_inversion_test (void) if (result < 0) return result; - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ready_mon, this->ts_->ready_mtx_,-1)); + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, this->ts_->ready_mtx_,-1)); // Wait on the condition variable until the high priority thread // wakes us up. @@ -748,7 +748,7 @@ Client_i::do_thread_per_rate_test (void) ACE_DEBUG ((LM_DEBUG, "(%t) Waiting for argument parsing\n")); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ready_mon, this->ts_->ready_mtx_,-1)); + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, this->ts_->ready_mtx_,-1)); // Wait on the condition variable until the high priority thread // wakes us up. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp index 68a48a58392..68f02a06aad 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp @@ -203,7 +203,7 @@ Server::activate_high_servant (void) this->high_priority_, -1)); - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, -1)); diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 5379d3b2b6f..178b9983c48 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -25,7 +25,7 @@ CORBA_Context::~CORBA_Context (void) CORBA::ULong CORBA_Context::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); @@ -37,7 +37,7 @@ CORBA::ULong CORBA_Context::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 8459eb29b4d..80142f84337 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -103,7 +103,7 @@ private: CORBA::ULong refcount_; // Reference counting. - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; // Protect the reference count. }; @@ -236,7 +236,7 @@ private: CORBA_ContextList (const CORBA_ContextList &); CORBA_ContextList &operator= (const CORBA_ContextList &); - ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> ref_count_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ref_count_; // Reference counter. ACE_Unbounded_Queue<char *> ctx_list_; diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 712bc355976..0eefbd7e0d1 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -104,11 +104,11 @@ CORBA_ExceptionList::_decr_refcnt (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 9a8f3e3f969..52d4a85758b 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -99,7 +99,7 @@ private: CORBA_ExceptionList (const CORBA_ExceptionList &); CORBA_ExceptionList &operator= (const CORBA_ExceptionList &); - ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> ref_count_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> ref_count_; // Reference counter. ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_; diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index bdeb17fd212..e14522f0bcd 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -20,7 +20,7 @@ ACE_RCSID(DynamicInterface, Request, "$Id$") CORBA::ULong CORBA_Request::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -32,7 +32,7 @@ CORBA::ULong CORBA_Request::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -280,7 +280,7 @@ void CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV) { { - ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -354,7 +354,7 @@ CORBA_Request::get_response (CORBA::Environment &ACE_TRY_ENV) CORBA::Boolean CORBA_Request::poll_response (CORBA::Environment &) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -384,7 +384,7 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming, ACE_CHECK; { - ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index f71a6492016..bb6975e77d6 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -203,7 +203,7 @@ private: CORBA::ULong refcount_; // Reference counting. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Protect the refcount_ and response_receieved_. int lazy_evaluation_; diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index cbd3e242bbc..dcb3fab53c8 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -19,7 +19,7 @@ ACE_RCSID(DynamicInterface, Server_Request, "$Id$") CORBA::ULong CORBA_ServerRequest::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -31,7 +31,7 @@ CORBA::ULong CORBA_ServerRequest::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 0dfcd3d2c92..f312c8bdbd8 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -134,7 +134,7 @@ private: CORBA::ULong refcount_; // Reference counting. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Protect the refcount_ and response_receieved_. TAO_ServerRequest &orb_server_request_; diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 01e8c7dfde0..8379a76b583 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -65,7 +65,7 @@ CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core) CORBA::ULong CORBA_Environment::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); return refcount_++; } @@ -73,7 +73,7 @@ CORBA::ULong CORBA_Environment::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); this->refcount_--; if (this->refcount_ != 0) diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index f3c24438f86..79366961e9f 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -127,7 +127,7 @@ private: CORBA::ULong refcount_; /// Protect the reference count. - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; }; /** diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 6c1c5da16d8..8b7bc826617 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -120,7 +120,7 @@ CORBA_Exception::_tao_any_destructor (void *x) CORBA::ULong CORBA_Exception::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); return ++this->refcount_; } @@ -128,7 +128,7 @@ CORBA::ULong CORBA_Exception::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 40bcc74c383..49889faff3a 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -122,7 +122,7 @@ private: * expensive, because uses of this class should never be on the * critical path. */ - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; }; #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 68edb54c0a0..32d66140061 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -509,11 +509,11 @@ template class ACE_Connect_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNEC template class ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>; template class ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>; -template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*>; -template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; template class ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -532,11 +532,11 @@ template class ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*>; #pragma instantiate ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR> #pragma instantiate ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> -#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index 0b40536072c..0e71b7f9f32 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -25,7 +25,7 @@ TAO_IOR_Table_Impl::find (const char *object_key, ACE_CString key (object_key); ACE_CString ior; - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (this->map_.find (key, ior) == 0) { return CORBA::string_dup (ior.c_str ()); @@ -47,7 +47,7 @@ TAO_IOR_Table_Impl::bind ( IORTable::AlreadyBound )) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->map_.bind (object_key, IOR) != 0) ACE_THROW (IORTable::AlreadyBound ()); } @@ -62,7 +62,7 @@ TAO_IOR_Table_Impl::rebind ( CORBA::SystemException )) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->map_.rebind (object_key, IOR); } @@ -76,7 +76,7 @@ TAO_IOR_Table_Impl::unbind ( IORTable::NotFound )) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->map_.unbind (object_key) != 0) ACE_THROW (IORTable::NotFound ()); } @@ -90,6 +90,6 @@ TAO_IOR_Table_Impl::set_locator ( CORBA::SystemException )) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->locator_ = IORTable::Locator::_duplicate (locator); } diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index dc2d7e9c25f..ded61994aa4 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -99,7 +99,7 @@ private: IORTable::Locator_var locator_; /// Synchronization - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp index 379c0d6fd4e..54b04613a25 100644 --- a/TAO/tao/Leader_Follower.cpp +++ b/TAO/tao/Leader_Follower.cpp @@ -18,17 +18,17 @@ TAO_Leader_Follower::~TAO_Leader_Follower (void) this->reactor_ = 0; } -ACE_SYNCH_CONDITION* +TAO_SYNCH_CONDITION* TAO_Leader_Follower::get_next_follower (void) { - ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION *> iterator ( + ACE_Unbounded_Set_Iterator<TAO_SYNCH_CONDITION *> iterator ( this->follower_set_); if (iterator.first () == 0) // means set is empty return 0; - ACE_SYNCH_CONDITION *cond = *iterator; + TAO_SYNCH_CONDITION *cond = *iterator; #if defined (TAO_DEBUG_LEADER_FOLLOWER) ACE_DEBUG ((LM_DEBUG, @@ -99,7 +99,7 @@ TAO_Leader_Follower::reactor (void) { if (this->reactor_ == 0) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock (), 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), 0); if (this->reactor_ == 0) { this->reactor_ = @@ -156,14 +156,14 @@ TAO_Leader_Follower::reset_client_thread (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<ACE_SYNCH_CONDITION*>; -template class ACE_Unbounded_Set<ACE_SYNCH_CONDITION*>; -template class ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>; +template class ACE_Node<TAO_SYNCH_CONDITION*>; +template class ACE_Unbounded_Set<TAO_SYNCH_CONDITION*>; +template class ACE_Unbounded_Set_Iterator<TAO_SYNCH_CONDITION*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<ACE_SYNCH_CONDITION*> -#pragma instantiate ACE_Unbounded_Set<ACE_SYNCH_CONDITION*> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*> +#pragma instantiate ACE_Node<TAO_SYNCH_CONDITION*> +#pragma instantiate ACE_Unbounded_Set<TAO_SYNCH_CONDITION*> +#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_SYNCH_CONDITION*> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index d3daf4a20c0..569133484fd 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -80,7 +80,7 @@ public: * returns 0 on success, -1 on failure and 1 if the element is * already there. */ - int add_follower (ACE_SYNCH_CONDITION *follower_ptr); + int add_follower (TAO_SYNCH_CONDITION *follower_ptr); /// checks for the availablity of a follower /// returns 1 on available, 0 else @@ -88,15 +88,15 @@ public: /// removes a follower from the leader-follower set /// returns 0 on success, -1 on failure - int remove_follower (ACE_SYNCH_CONDITION *follower_ptr); + int remove_follower (TAO_SYNCH_CONDITION *follower_ptr); /// returns randomly a follower from the leader-follower set /// returns follower on success, else 0 - ACE_SYNCH_CONDITION *get_next_follower (void); + TAO_SYNCH_CONDITION *get_next_follower (void); /// Accessors - ACE_SYNCH_MUTEX &lock (void); - ACE_Reverse_Lock<ACE_SYNCH_MUTEX> &reverse_lock (void); + TAO_SYNCH_MUTEX &lock (void); + ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock (void); /// Check if there are any client threads running int has_clients (void) const; @@ -123,12 +123,12 @@ private: TAO_ORB_Core *orb_core_; /// To synchronize access to the members. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; /// do protect the access to the following three members - ACE_Reverse_Lock<ACE_SYNCH_MUTEX> reverse_lock_; + ACE_Reverse_Lock<TAO_SYNCH_MUTEX> reverse_lock_; - ACE_Unbounded_Set<ACE_SYNCH_CONDITION *> follower_set_; + ACE_Unbounded_Set<TAO_SYNCH_CONDITION *> follower_set_; // keep a set of followers around (protected) /** @@ -154,7 +154,7 @@ private: /// Condition variable for server threads waiting for the client /// leader to complete. - ACE_SYNCH_CONDITION event_loop_threads_condition_; + TAO_SYNCH_CONDITION event_loop_threads_condition_; }; class TAO_Export TAO_LF_Client_Thread_Helper diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i index bacefd153d1..08a0a301058 100644 --- a/TAO/tao/Leader_Follower.i +++ b/TAO/tao/Leader_Follower.i @@ -39,7 +39,7 @@ TAO_Leader_Follower::elect_new_leader (void) } else if (this->follower_available ()) { - ACE_SYNCH_CONDITION* condition_ptr = this->get_next_follower (); + TAO_SYNCH_CONDITION* condition_ptr = this->get_next_follower (); if (condition_ptr == 0 || condition_ptr->signal () == -1) return -1; } @@ -104,7 +104,7 @@ TAO_Leader_Follower::reset_event_loop_thread (void) this->reset_event_loop_thread_i (tss); } -ACE_INLINE ACE_SYNCH_MUTEX & +ACE_INLINE TAO_SYNCH_MUTEX & TAO_Leader_Follower::lock (void) { return this->lock_; @@ -117,7 +117,7 @@ TAO_Leader_Follower::set_upcall_thread (void) if (tss->event_loop_thread_ > 0) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock ()); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock ()); this->reset_event_loop_thread_i (tss); this->elect_new_leader (); @@ -156,18 +156,18 @@ TAO_Leader_Follower::is_client_leader_thread (void) const } ACE_INLINE int -TAO_Leader_Follower::add_follower (ACE_SYNCH_CONDITION *follower_ptr) +TAO_Leader_Follower::add_follower (TAO_SYNCH_CONDITION *follower_ptr) { return this->follower_set_.insert (follower_ptr); } ACE_INLINE int -TAO_Leader_Follower::remove_follower (ACE_SYNCH_CONDITION *follower_ptr) +TAO_Leader_Follower::remove_follower (TAO_SYNCH_CONDITION *follower_ptr) { return this->follower_set_.remove (follower_ptr); } -ACE_INLINE ACE_Reverse_Lock<ACE_SYNCH_MUTEX> & +ACE_INLINE ACE_Reverse_Lock<TAO_SYNCH_MUTEX> & TAO_Leader_Follower::reverse_lock (void) { return this->reverse_lock_; @@ -208,7 +208,7 @@ TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper (void) ACE_INLINE int TAO_LF_Event_Loop_Thread_Helper::set_event_loop_thread (ACE_Time_Value *max_wait_time) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->leader_follower_.lock (), -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->leader_follower_.lock (), -1); int result = this->leader_follower_.set_event_loop_thread (max_wait_time); @@ -230,7 +230,7 @@ TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper (TAO_Leader_Fol ACE_INLINE TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->leader_follower_.lock ()); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->leader_follower_.lock ()); if (this->call_reset_) this->leader_follower_.reset_event_loop_thread (); diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index f83ae8f6b44..e5aad8bf0a9 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -235,7 +235,7 @@ TAO_MProfile::policy_list (void) { if (!this->is_policy_list_initialized_) { - ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, 0); diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index ba1255a070a..d2cfce4a8f1 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -191,7 +191,7 @@ protected: /// Mutex used to make sure that only one policy list /// is created. - ACE_SYNCH_RECURSIVE_MUTEX mutex_; + TAO_SYNCH_RECURSIVE_MUTEX mutex_; protected: /// return the complete list of profiles, this object retains diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index ca989ba0ca9..f82ec718d79 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -26,7 +26,7 @@ CORBA::ULong TAO_Muxed_TMS::request_id (void) { // @@ What is a good error return value? - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); return this->request_id_generator_++; } @@ -56,7 +56,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id, void TAO_Muxed_TMS::unbind_dispatcher (CORBA::ULong request_id) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); TAO_Reply_Dispatcher *rd = 0; (void) this->dispatcher_table_.unbind (request_id, rd); } @@ -74,7 +74,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) // Grab the reply dispatcher for this id. { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); result = this->dispatcher_table_.unbind (params.request_id_, rd); } @@ -137,7 +137,7 @@ TAO_Muxed_TMS::idle_after_reply (void) void TAO_Muxed_TMS::connection_closed (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); // @@ This should be done using a mutex, the table diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h index a7385f1ce0a..0fdf9fd71f8 100644 --- a/TAO/tao/Muxed_TMS.h +++ b/TAO/tao/Muxed_TMS.h @@ -69,7 +69,7 @@ public: protected: /// Lock to protect the state of this class - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; /// Used to generate a different request_id on each call to /// request_id(). diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 519c26ba223..6d1891a2664 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -24,7 +24,7 @@ ACE_RCSID(tao, NVList, "$Id$") CORBA::ULong CORBA_NamedValue::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); return this->refcount_++; } @@ -32,7 +32,7 @@ CORBA::ULong CORBA_NamedValue::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; @@ -57,7 +57,7 @@ CORBA_NamedValue::~CORBA_NamedValue (void) CORBA::ULong CORBA_NVList::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); return this->refcount_++; } @@ -65,7 +65,7 @@ CORBA::ULong CORBA_NVList::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; @@ -283,7 +283,7 @@ CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr, ACE_TRY_ENV); return; } - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); if (this->incoming_ != 0) { delete this->incoming_; @@ -300,7 +300,7 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, int flag, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); if (this->incoming_ != 0) { if (this->max_ == 0) @@ -413,7 +413,7 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming, ptr_arith_t CORBA_NVList::_tao_target_alignment (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_, ACE_CDR::MAX_ALIGNMENT); if (this->incoming_ == 0) return ACE_CDR::MAX_ALIGNMENT; @@ -425,7 +425,7 @@ CORBA_NVList::_tao_target_alignment (void) void CORBA_NVList::evaluate (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_); if (this->incoming_ == 0) return; diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index 0d23b31f066..fcfa5d2c74a 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -72,7 +72,7 @@ private: CORBA::ULong refcount_; /// Protects the reference count. - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; /// holds the value CORBA::Any any_; @@ -308,7 +308,7 @@ private: CORBA::ULong refcount_; /// Protects the reference count. - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; /** * When the NVList is used as part of a Server Request we can simply diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index f591977d83c..f5d540f94d1 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1181,7 +1181,7 @@ CORBA::ORB_init (int &argc, { // Using ACE_Static_Object_Lock::instance() precludes <ORB_init> // from being called within a static object CTOR. - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), CORBA::ORB::_nil ())); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 9841c3ec537..7a5002d2366 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -436,7 +436,7 @@ private: private: /// lock required for mutual exclusion between multiple threads. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; /// Maintains a reference count of number of instantiations of the /// ORB. diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i index 2449123291c..ff74200abe5 100644 --- a/TAO/tao/ORB.i +++ b/TAO/tao/ORB.i @@ -10,7 +10,7 @@ ACE_INLINE CORBA::ULong CORBA_ORB::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, lock_, 0); return ++this->refcount_; } @@ -18,7 +18,7 @@ ACE_INLINE CORBA::ULong CORBA_ORB::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index b9fabb10875..fca90c9eec1 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -22,7 +22,7 @@ PortableInterceptor::register_orb_initializer ( // Using ACE_Static_Object_Lock::instance() precludes // <register_orb_initializer> from being called within a static // object CTOR. - ACE_MT (ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, + ACE_MT (ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance ())); // Make sure TAO's singleton manager is initialized. @@ -118,12 +118,12 @@ TAO_ORBInitializer_Registry::post_init ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Singleton<TAO_ORBInitializer_Registry, ACE_SYNCH_MUTEX>; +template class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>; template class ACE_Array_Base<PortableInterceptor::ORBInitializer_ptr>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Singleton<TAO_ORBInitializer_Registry, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX> #pragma instantiate ACE_Array_Base<PortableInterceptor::ORBInitializer_ptr> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index 3754ad869a4..ef00b8b846f 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -33,7 +33,7 @@ */ class TAO_Export TAO_ORBInitializer_Registry { - friend class TAO_Singleton<TAO_ORBInitializer_Registry, ACE_SYNCH_MUTEX>; + friend class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>; friend void PortableInterceptor::register_orb_initializer ( PortableInterceptor::ORBInitializer_ptr init, CORBA::Environment &); diff --git a/TAO/tao/ORBInitializer_Registry.inl b/TAO/tao/ORBInitializer_Registry.inl index 9f1fb79158f..6c441e4d44c 100644 --- a/TAO/tao/ORBInitializer_Registry.inl +++ b/TAO/tao/ORBInitializer_Registry.inl @@ -6,5 +6,5 @@ ACE_INLINE TAO_ORBInitializer_Registry * TAO_ORBInitializer_Registry::instance (void) { return - TAO_Singleton<TAO_ORBInitializer_Registry, ACE_SYNCH_MUTEX>::instance (); + TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>::instance (); } diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index fe3ae7c405c..2d4aa73212a 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -841,7 +841,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) arg_shifter.consume_arg (); } - //////////////////////////////////////////////////////////////// // catch any unknown -ORB args // //////////////////////////////////////////////////////////////// @@ -1085,8 +1084,58 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // in the shutdown state. this->has_shutdown_ = 0; +#if (TAO_HAS_RT_CORBA == 1) + // check RT ORB options + if (this->RT_ORB_init (argc, argv, ACE_TRY_ENV) != 0) + return -1; +#endif /* TAO_HAS_RT_CORBA */ + + return 0; +} + +#if (TAO_HAS_RT_CORBA == 1) +int +TAO_ORB_Core::RT_ORB_init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) +{ + ACE_Arg_Shifter arg_shifter (argc, argv); + + while (arg_shifter.is_anything_left ()) + { + char *current_arg = 0; + + /* Place holder for future RTORB options */ + + if (arg_shifter.cur_arg_strncasecmp ("-RTORB") != -1) + { + if (TAO_debug_level > 0) + { + current_arg = arg_shifter.get_current (); + ACE_DEBUG ((LM_ERROR, + ACE_TEXT ("ERROR: Unknown \"-RTORB\" option ") + ACE_TEXT ("<%s>.\n"), + ((current_arg == 0) ? "<NULL>" : current_arg))); + } + + ACE_THROW_RETURN (CORBA::BAD_PARAM ( + CORBA::SystemException::_tao_minor_code ( + TAO_ORB_CORE_INIT_LOCATION_CODE, + EINVAL), + CORBA::COMPLETED_NO), + -1); + } + + //////////////////////////////////////////////////////////////// + // ok, we can't interpret this argument, move to next argument// + //////////////////////////////////////////////////////////////// + else + // Any arguments that don't match are ignored so that the + // caller can still use them. + arg_shifter.ignore_arg (); + } + return 0; } +#endif /* TAO_HAS_RT_CORBA */ int TAO_ORB_Core::fini (void) @@ -1535,7 +1584,7 @@ TAO_ORB_Core::poa_adapter (void) { if (this->poa_adapter_ == 0) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (this->poa_adapter_ == 0) { this->poa_adapter_ = @@ -1545,7 +1594,7 @@ TAO_ORB_Core::poa_adapter (void) return this->poa_adapter_; } -ACE_SYNCH_CONDITION * +TAO_SYNCH_CONDITION * TAO_ORB_Core::leader_follower_condition_variable (void) { // Always using TSS. @@ -1557,7 +1606,7 @@ TAO_ORB_Core::leader_follower_condition_variable (void) { // Create a new one and return. ACE_NEW_RETURN (tss->leader_follower_condition_variable_, - ACE_SYNCH_CONDITION (this->leader_follower ().lock ()), + TAO_SYNCH_CONDITION (this->leader_follower ().lock ()), 0); } @@ -1720,7 +1769,7 @@ TAO_ORB_Core::create_object (TAO_Stub *stub) // @@ Ossama: maybe we need another lock for the table, to // reduce contention on the Static_Object_Lock below, if so // then we need to use that lock in the ORB_init() function. - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), 0)); @@ -1936,7 +1985,7 @@ TAO_ORB_Core::destroy (CORBA_Environment &ACE_TRY_ENV) // Now remove it from the ORB table so that it's ORBid may be // reused. { - ACE_MT (ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, + ACE_MT (ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance ())); TAO_ORB_Table::instance ()->unbind (this->orbid_); } @@ -1951,7 +2000,7 @@ TAO_ORB_Core::open (CORBA::Environment &ACE_TRY_ENV) if (this->open_called_ == 1) return 1; - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, tao_mon, this->open_lock_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, tao_mon, this->open_lock_, -1); if (this->open_called_ == 1) return 1; @@ -2148,7 +2197,7 @@ TAO_ORB_Core::resolve_rir (const char *name, if (list_of_profiles[list_of_profiles.length() - 1] != object_key_delimiter) list_of_profiles += ACE_CString (object_key_delimiter); - + list_of_profiles += object_id; return this->orb ()->string_to_object (list_of_profiles.c_str (), @@ -2235,7 +2284,7 @@ TAO_ORB_Core::input_cdr_dblock_allocator (void) if (this->orb_resources_.input_cdr_dblock_allocator_ == 0) { // Double checked locking - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (this->orb_resources_.input_cdr_dblock_allocator_ == 0) this->orb_resources_.input_cdr_dblock_allocator_ = this->resource_factory ()->input_cdr_dblock_allocator (); @@ -2272,7 +2321,7 @@ TAO_ORB_Core::input_cdr_buffer_allocator (void) if (this->orb_resources_.input_cdr_buffer_allocator_ == 0) { // Double checked locking - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (this->orb_resources_.input_cdr_buffer_allocator_ == 0) this->orb_resources_.input_cdr_buffer_allocator_ = this->resource_factory ()->input_cdr_buffer_allocator (); @@ -2306,7 +2355,7 @@ TAO_ORB_Core::output_cdr_dblock_allocator (void) if (this->orb_resources_.output_cdr_dblock_allocator_ == 0) { // Double checked locking - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (this->orb_resources_.output_cdr_dblock_allocator_ == 0) this->orb_resources_.output_cdr_dblock_allocator_ = this->resource_factory ()->output_cdr_dblock_allocator (); @@ -2341,7 +2390,7 @@ TAO_ORB_Core::output_cdr_buffer_allocator (void) if (this->orb_resources_.output_cdr_buffer_allocator_ == 0) { // Double checked locking - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (this->orb_resources_.output_cdr_buffer_allocator_ == 0) this->orb_resources_.output_cdr_buffer_allocator_ = this->resource_factory ()->output_cdr_buffer_allocator (); @@ -2412,7 +2461,7 @@ TAO_ORB_Core::reactor (void) if (this->reactor_ == 0) { // Double checked locking - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (this->reactor_ == 0) { this->reactor_ = @@ -2432,7 +2481,7 @@ TAO_ORB_Core::reactor (TAO_Acceptor *acceptor) if (this->reactor_ == 0) { // Double checked locking - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (this->reactor_ == 0) { this->reactor_ = @@ -2456,7 +2505,7 @@ TAO_ORB_Core::implrepo_service (void) CORBA::Object_var temp = this->orb_->resolve_initial_references ("ImplRepoService", ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ()); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ()); // @@ Worry about assigning a different IOR? (brunsch) this->implrepo_service_ = temp._retn (); @@ -2773,7 +2822,7 @@ TAO_ORB_Core_instance (void) TAO_ORB_Table *orb_table = TAO_ORB_Table::instance (); if (orb_table->first_orb () == 0) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), 0)); if (orb_table->first_orb () == 0) @@ -2837,17 +2886,17 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object) template class ACE_Lock_Adapter<ACE_Null_Mutex>; #if defined (ACE_HAS_THREADS) -template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>; -template class ACE_Lock_Adapter<ACE_Thread_Mutex>; +template class ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX>; +template class ACE_Lock_Adapter<TAO_SYNCH_MUTEX>; #endif /* ACE_HAS_THREADS */ -template class ACE_Reverse_Lock<ACE_SYNCH_MUTEX>; -template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >; +template class ACE_Reverse_Lock<TAO_SYNCH_MUTEX>; +template class ACE_Guard<ACE_Reverse_Lock<TAO_SYNCH_MUTEX> >; template class ACE_Env_Value<int>; template class ACE_Env_Value<u_int>; -template class TAO_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX>; +template class TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>; template class ACE_TSS<TAO_TSS_Resources>; template class ACE_TSS<TAO_ORB_Core_TSS_Resources>; @@ -2866,17 +2915,17 @@ template class ACE_Array_Base<void *>; #pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex> #if defined (ACE_HAS_THREADS) -#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> -#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex> +#pragma instantiate ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate ACE_Lock_Adapter<TAO_SYNCH_MUTEX> #endif /* ACE_HAS_THREADS */ -#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> > +#pragma instantiate ACE_Reverse_Lock<TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Guard<ACE_Reverse_Lock<TAO_SYNCH_MUTEX> > #pragma instantiate ACE_Env_Value<int> #pragma instantiate ACE_Env_Value<u_int> -#pragma instantiate TAO_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> #pragma instantiate ACE_TSS<TAO_TSS_Resources> #pragma instantiate ACE_TSS<TAO_ORB_Core_TSS_Resources> diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 33468ec2cf2..27a3204c77c 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -153,7 +153,7 @@ public: int client_leader_thread_; /// Condition variable for the leader follower model. - ACE_SYNCH_CONDITION* leader_follower_condition_variable_; + TAO_SYNCH_CONDITION* leader_follower_condition_variable_; /// The Reactor Holder that we should callback when destroying the /// cookie. @@ -666,7 +666,7 @@ public: /// Condition variable used in the Leader Follower Wait Strategy, on /// which the follower thread blocks. - ACE_SYNCH_CONDITION* leader_follower_condition_variable (void); + TAO_SYNCH_CONDITION* leader_follower_condition_variable (void); /// Makes sure that the ORB is open and then creates a TAO_Stub /// based on the endpoint. @@ -936,7 +936,7 @@ private: protected: /// Synchronize internal state... - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; /// The connector registry which all active connectors must register /// themselves with. @@ -1096,7 +1096,7 @@ protected: ACE_Thread_Manager tm_; /// The data block reference counts are locked using this mutex - ACE_Lock_Adapter<ACE_SYNCH_MUTEX> data_block_lock_; + ACE_Lock_Adapter<TAO_SYNCH_MUTEX> data_block_lock_; /// Codeset translators for simple implementations. @@ -1139,7 +1139,7 @@ protected: /// Mutual exclusion for calling open. - ACE_SYNCH_MUTEX open_lock_; + TAO_SYNCH_MUTEX open_lock_; /// Flag which denotes that the open method was called. int open_called_; @@ -1166,6 +1166,9 @@ protected: /// Manager for setting priority mapping. static CORBA::Object_ptr priority_mapping_manager_; + // RT ORB specific command line argument parsing. + int RT_ORB_init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV); + #endif /* TAO_HAS_RT_CORBA == 1 */ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -1312,7 +1315,7 @@ public: /** * @todo TAO_TSS_RESOURCES singleton typedef should go away. */ -typedef TAO_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX> +typedef TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> TAO_TSS_RESOURCES; // **************************************************************** diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index e65471d8c8b..2a3b815aec1 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -4,7 +4,7 @@ ACE_INLINE CORBA::ULong TAO_ORB_Core::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); return this->refcount_++; } @@ -12,7 +12,7 @@ ACE_INLINE CORBA::ULong TAO_ORB_Core::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; @@ -484,7 +484,7 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_typecodefactory (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->typecode_factory_)) { @@ -504,7 +504,7 @@ TAO_ORB_Core::typecode_factory (const CORBA::Object_ptr tf) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_dynanyfactory (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->dynany_factory_)) { @@ -517,7 +517,7 @@ TAO_ORB_Core::resolve_dynanyfactory (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_ior_manipulation (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->ior_manip_factory_)) { @@ -530,7 +530,7 @@ TAO_ORB_Core::resolve_ior_manipulation (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_ior_table (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->ior_table_)) { @@ -577,14 +577,14 @@ TAO_ORB_Core::policy_current (void) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::poa_current (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); return CORBA::Object::_duplicate (this->poa_current_.in ()); } ACE_INLINE void TAO_ORB_Core::poa_current (CORBA::Object_ptr current) { - ACE_GUARD (ACE_SYNCH_MUTEX, mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); this->poa_current_ = CORBA::Object::_duplicate (current); } diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp index e8d2c3dc7da..8be62937515 100644 --- a/TAO/tao/ORB_Table.cpp +++ b/TAO/tao/ORB_Table.cpp @@ -128,7 +128,7 @@ TAO_ORB_Table::unbind (const char *orb_id) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Singleton<TAO_ORB_Table,ACE_SYNCH_MUTEX>; +template class TAO_Singleton<TAO_ORB_Table,TAO_SYNCH_MUTEX>; template class ACE_Hash_Map_Entry<const char *, TAO_ORB_Core *>; template class ACE_Hash_Map_Manager<const char *, TAO_ORB_Core *, ACE_Null_Mutex>; @@ -141,7 +141,7 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_ORB_Core *, AC #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Singleton<TAO_ORB_Table,ACE_SYNCH_MUTEX> +#pragma instantiate TAO_Singleton<TAO_ORB_Table,TAO_SYNCH_MUTEX> #pragma instantiate ACE_Hash_Map_Entry<const char *, TAO_ORB_Core *> #pragma instantiate ACE_Hash_Map_Manager<const char *, TAO_ORB_Core *, ACE_Null_Mutex> diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index e3084466c6d..db8f7465958 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -23,6 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/orbconf.h" #include "tao/TAO_Singleton.h" #include "ace/Synch.h" #include "ace/Hash_Map_Manager_T.h" @@ -46,7 +47,7 @@ class TAO_ORB_Core; */ class TAO_Export TAO_ORB_Table { - friend class TAO_Singleton<TAO_ORB_Table, ACE_SYNCH_MUTEX>; + friend class TAO_Singleton<TAO_ORB_Table, TAO_SYNCH_MUTEX>; public: /// destructor diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl index 76511113d32..bb93d4ef56a 100644 --- a/TAO/tao/ORB_Table.inl +++ b/TAO/tao/ORB_Table.inl @@ -5,7 +5,7 @@ ACE_INLINE TAO_ORB_Table * TAO_ORB_Table::instance (void) { - return TAO_Singleton<TAO_ORB_Table, ACE_SYNCH_MUTEX>::instance (); + return TAO_Singleton<TAO_ORB_Table, TAO_SYNCH_MUTEX>::instance (); } ACE_INLINE TAO_ORB_Core * diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index a1586cbb346..bc631e78346 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -282,7 +282,7 @@ private: /// Protect the reference count, this is OK because we do no /// duplicates or releases on the critical path. - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; // = Unimplemented methods CORBA_Object (const CORBA_Object &); diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index 1e20ff5cf37..21bf2291b44 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -17,7 +17,7 @@ CORBA_Object::CORBA_Object (int) ACE_INLINE CORBA::ULong CORBA_Object::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->refcount_lock_, 0); return this->refcount_++; } @@ -25,7 +25,7 @@ ACE_INLINE CORBA::ULong CORBA_Object::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->refcount_lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 796ae329440..1d92e6d78c6 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -245,7 +245,7 @@ public: private: /// Protect access - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; /// The implementation. TAO_Policy_Manager_Impl impl_; diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index 14ab2cde5da..fb353b44358 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -44,7 +44,7 @@ TAO_Policy_Manager::get_policy ( CORBA::PolicyType policy, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.get_policy (policy, ACE_TRY_ENV); } @@ -56,7 +56,7 @@ TAO_Policy_Manager::get_policy_overrides ( CORBA::SystemException )) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.get_policy_overrides (ts, ACE_TRY_ENV); } @@ -70,7 +70,7 @@ TAO_Policy_Manager::set_policy_overrides ( CORBA_InvalidPolicies )) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV); } @@ -80,7 +80,7 @@ TAO_Policy_Manager::relative_roundtrip_timeout (void) // Double-checked locking. if (this->impl_.relative_roundtrip_timeout_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.relative_roundtrip_timeout (); } return 0; @@ -94,7 +94,7 @@ TAO_Policy_Manager::client_priority (void) // Double-checked locking. if (this->impl_.client_priority_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.client_priority (); } return 0; @@ -108,7 +108,7 @@ TAO_Policy_Manager::sync_scope (void) // Double-checked locking. if (this->impl_.sync_scope_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.sync_scope (); } return 0; @@ -122,7 +122,7 @@ TAO_Policy_Manager::buffering_constraint (void) // Double-checked locking. if (this->impl_.buffering_constraint_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.buffering_constraint (); } return 0; @@ -138,7 +138,7 @@ TAO_Policy_Manager::priority_model (void) // Double-checked locking. if (this->impl_.priority_model_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.priority_model (); } return 0; @@ -150,7 +150,7 @@ TAO_Policy_Manager::threadpool (void) // Double-checked locking. if (this->impl_.threadpool_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.threadpool (); } return 0; @@ -162,7 +162,7 @@ TAO_Policy_Manager::private_connection (void) // Double-checked locking. if (this->impl_.private_connection_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.private_connection (); } return 0; @@ -174,7 +174,7 @@ TAO_Policy_Manager::priority_banded_connection (void) // Double-checked locking. if (this->impl_.priority_banded_connection_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.priority_banded_connection (); } return 0; @@ -186,7 +186,7 @@ TAO_Policy_Manager::server_protocol (void) // Double-checked locking. if (this->impl_.server_protocol_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.server_protocol (); } return 0; @@ -198,7 +198,7 @@ TAO_Policy_Manager::client_protocol (void) // Double-checked locking. if (this->impl_.client_protocol_) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.client_protocol (); } return 0; diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index 84f57d89ad6..daa769d31fa 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -214,7 +214,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factor CORBA::Environment &ACE_TRY_ENV ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); // Remove any existing <proxy_factory_> and replace with the new one. this->unregister_proxy_factory (ACE_TRY_ENV); @@ -228,7 +228,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factor CORBA::Environment & ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) { @@ -248,7 +248,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factor CORBA::Environment & ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); // Verify that an <proxy_factory_> is available else make one. if (this->proxy_factory_ == 0) @@ -297,9 +297,9 @@ void ImplementationRepository::TAO_ImplementationRepository_ServerObject_Smart_P #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) -template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >; +template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ static const CORBA::Long _oc_ImplementationRepository_ServerObject[] = @@ -1790,7 +1790,7 @@ ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Fact CORBA::Environment &ACE_TRY_ENV ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); // Remove any existing <proxy_factory_> and replace with the new one. this->unregister_proxy_factory (ACE_TRY_ENV); @@ -1804,7 +1804,7 @@ ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Fact CORBA::Environment & ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) { @@ -1824,7 +1824,7 @@ ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Fact CORBA::Environment & ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); // Verify that an <proxy_factory_> is available else make one. if (this->proxy_factory_ == 0) @@ -2004,9 +2004,9 @@ void ImplementationRepository::TAO_ImplementationRepository_Administration_Smart #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) -template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >; +template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ static const CORBA::Long _oc_ImplementationRepository_Administration[] = @@ -2242,7 +2242,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator CORBA::Environment &ACE_TRY_ENV ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); // Remove any existing <proxy_factory_> and replace with the new one. this->unregister_proxy_factory (ACE_TRY_ENV); @@ -2256,7 +2256,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator CORBA::Environment & ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) { @@ -2276,7 +2276,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator CORBA::Environment & ) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0)); // Verify that an <proxy_factory_> is available else make one. if (this->proxy_factory_ == 0) @@ -2329,9 +2329,9 @@ void ImplementationRepository::TAO_ImplementationRepository_ServerInformationIte #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) -template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >; +template class TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate TAO_Singleton<ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[] = diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index 98eb947a86b..121ab40bf05 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -204,7 +204,7 @@ class TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter { public: - friend class TAO_Singleton<TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; + friend class TAO_Singleton<TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; int register_proxy_factory ( TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory *df, @@ -231,10 +231,10 @@ protected: ); TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory *proxy_factory_; int delete_proxy_factory_; - ACE_SYNCH_RECURSIVE_MUTEX lock_; + TAO_SYNCH_RECURSIVE_MUTEX lock_; }; - typedef TAO_Singleton<TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_ServerObject_PROXY_FACTORY_ADAPTER; + typedef TAO_Singleton<TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_ServerObject_PROXY_FACTORY_ADAPTER; class TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base : public virtual ACE_NESTED_CLASS (ImplementationRepository, ServerObject) { public: @@ -1195,7 +1195,7 @@ class TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter { public: - friend class TAO_Singleton<TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; + friend class TAO_Singleton<TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; int register_proxy_factory ( TAO_ImplementationRepository_Administration_Default_Proxy_Factory *df, @@ -1222,10 +1222,10 @@ protected: ); TAO_ImplementationRepository_Administration_Default_Proxy_Factory *proxy_factory_; int delete_proxy_factory_; - ACE_SYNCH_RECURSIVE_MUTEX lock_; + TAO_SYNCH_RECURSIVE_MUTEX lock_; }; - typedef TAO_Singleton<TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_Administration_PROXY_FACTORY_ADAPTER; + typedef TAO_Singleton<TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_Administration_PROXY_FACTORY_ADAPTER; class TAO_ImplementationRepository_Administration_Smart_Proxy_Base : public virtual ACE_NESTED_CLASS (ImplementationRepository, Administration) { public: @@ -1490,7 +1490,7 @@ class TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapt { public: - friend class TAO_Singleton<TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; + friend class TAO_Singleton<TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; int register_proxy_factory ( TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory *df, @@ -1517,10 +1517,10 @@ protected: ); TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory *proxy_factory_; int delete_proxy_factory_; - ACE_SYNCH_RECURSIVE_MUTEX lock_; + TAO_SYNCH_RECURSIVE_MUTEX lock_; }; - typedef TAO_Singleton<TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_ServerInformationIterator_PROXY_FACTORY_ADAPTER; + typedef TAO_Singleton<TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_ImplementationRepository_ServerInformationIterator_PROXY_FACTORY_ADAPTER; class TAO_ImplementationRepository_ServerInformationIterator_Smart_Proxy_Base : public virtual ACE_NESTED_CLASS (ImplementationRepository, ServerInformationIterator) { public: diff --git a/TAO/tao/PortableServer/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp index 93a24f04b04..c1a63a5b197 100644 --- a/TAO/tao/PortableServer/MessagingS.cpp +++ b/TAO/tao/PortableServer/MessagingS.cpp @@ -179,7 +179,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); if (this->proxy_cache_[strategy] == 0) { diff --git a/TAO/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h index cd6cbeaf779..3fad152fc70 100644 --- a/TAO/tao/PortableServer/MessagingS.h +++ b/TAO/tao/PortableServer/MessagingS.h @@ -135,7 +135,7 @@ TAO_NAMESPACE POA_Messaging ::Messaging::_TAO_ReplyHandler_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; public: // This funxtion is used to get an handle to the unique instance diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index d13c0ddcad4..07ed3fdde40 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -206,14 +206,14 @@ TAO_Object_Adapter::~TAO_Object_Adapter (void) /* static */ ACE_Lock * TAO_Object_Adapter::create_lock (int enable_locking, - ACE_SYNCH_MUTEX &thread_lock) + TAO_SYNCH_MUTEX &thread_lock) { #if defined (ACE_HAS_THREADS) if (enable_locking) { ACE_Lock *the_lock; ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (thread_lock), + ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock), 0); return the_lock; } diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index ab8f4ea16c3..a6b1a382782 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -263,7 +263,7 @@ public: ACE_Lock &lock (void); - ACE_SYNCH_MUTEX &thread_lock (void); + TAO_SYNCH_MUTEX &thread_lock (void); ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void); @@ -343,7 +343,7 @@ protected: const poa_name &system_name); static ACE_Lock *create_lock (int enable_locking, - ACE_SYNCH_MUTEX &thread_lock); + TAO_SYNCH_MUTEX &thread_lock); public: @@ -508,7 +508,7 @@ protected: int enable_locking_; - ACE_SYNCH_MUTEX thread_lock_; + TAO_SYNCH_MUTEX thread_lock_; ACE_Lock *lock_; @@ -776,7 +776,7 @@ public: private: - ACE_SYNCH_CONDITION non_servant_upcall_condition_; + TAO_SYNCH_CONDITION non_servant_upcall_condition_; // Condition variable for waiting on non-servant upcalls to end. Non_Servant_Upcall *non_servant_upcall_in_progress_; diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i index 8a52c452825..ed8d95a7254 100644 --- a/TAO/tao/PortableServer/Object_Adapter.i +++ b/TAO/tao/PortableServer/Object_Adapter.i @@ -12,7 +12,7 @@ TAO_Object_Adapter::lock (void) return *this->lock_; } -ACE_INLINE ACE_SYNCH_MUTEX & +ACE_INLINE TAO_SYNCH_MUTEX & TAO_Object_Adapter::thread_lock (void) { return this->thread_lock_; diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index bc8c58c5064..fdd3cb7766b 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -367,7 +367,7 @@ template class ACE_Hash_Map_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<con template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; template class ACE_Hash_Map_Manager_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; template class ACE_Hash_Map_Entry<const char *, TAO_Skeleton>; -template class TAO_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX>; +template class TAO_Singleton<TAO_Operation_Table_Parameters, TAO_SYNCH_RECURSIVE_MUTEX>; #elif defined (ACE_HAS_GNU_REPO) // This is necessary with g++ 2.91.66 to avoid a couple of strange // unresolved ACE_Hash_Map_Entry symbols. (Strange because c++filt @@ -379,5 +379,5 @@ template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Entry<const char *, TAO_Skeleton> -#pragma instantiate TAO_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate TAO_Singleton<TAO_Operation_Table_Parameters, TAO_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index 5619abcf45a..c2a4e671f29 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -329,13 +329,13 @@ private: // Define a singleton instance of operation table parameters. typedef TAO_Singleton<TAO_Operation_Table_Parameters, - ACE_SYNCH_RECURSIVE_MUTEX> + TAO_SYNCH_RECURSIVE_MUTEX> TAO_OP_TABLE_PARAMETERS; // Define a singleton instance of the operation table factory. typedef TAO_Singleton<TAO_Operation_Table_Factory, - ACE_SYNCH_RECURSIVE_MUTEX> + TAO_SYNCH_RECURSIVE_MUTEX> TAO_OP_TABLE_FACTORY; #include "ace/post.h" diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index cb768d054cb..9f634a93cc5 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -101,7 +101,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, const TAO_POA_Policies &policies, TAO_POA *parent, ACE_Lock &lock, - ACE_SYNCH_MUTEX &thread_lock, + TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter, CORBA::Environment &ACE_TRY_ENV) diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index dd524bfa0bd..c5920df443f 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -650,7 +650,7 @@ public: const TAO_POA_Policies &policies, TAO_POA *parent, ACE_Lock &lock, - ACE_SYNCH_MUTEX &thread_lock, + TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter, CORBA_Environment &ACE_TRY_ENV); @@ -1023,13 +1023,13 @@ protected: CORBA::ULong outstanding_requests_; - ACE_SYNCH_CONDITION outstanding_requests_condition_; + TAO_SYNCH_CONDITION outstanding_requests_condition_; CORBA::Boolean wait_for_completion_pending_; CORBA::Boolean waiting_destruction_; - ACE_SYNCH_CONDITION servant_deactivation_condition_; + TAO_SYNCH_CONDITION servant_deactivation_condition_; CORBA::ULong waiting_servant_deactivation_; }; diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 30ea1538d74..06ed32203bc 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -158,7 +158,7 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV) return stub; } -ACE_SYNCH_MUTEX & +TAO_SYNCH_MUTEX & TAO_ServantBase::_single_threaded_poa_lock (void) { return *this->single_threaded_poa_lock_; @@ -174,7 +174,7 @@ TAO_ServantBase::_increment_single_threaded_poa_lock_count (void) if (current_count == 0) { ACE_NEW (this->single_threaded_poa_lock_, - ACE_SYNCH_MUTEX); + TAO_SYNCH_MUTEX); } } @@ -403,10 +403,10 @@ TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, long>; +template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, long>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> +#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 13e4cb4d6d3..a028e806619 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -106,7 +106,7 @@ protected: // = Should be protected/private, but a nested class needs it. public: - ACE_SYNCH_MUTEX &_single_threaded_poa_lock (void); + TAO_SYNCH_MUTEX &_single_threaded_poa_lock (void); // Access to the single threaded poa lock. protected: @@ -120,7 +120,7 @@ protected: // The operation table for this servant, it is initialized by the // most derived class. - ACE_SYNCH_MUTEX *single_threaded_poa_lock_; + TAO_SYNCH_MUTEX *single_threaded_poa_lock_; // Lock for single threaded POAs. u_long single_threaded_poa_lock_count_; @@ -186,7 +186,7 @@ protected: private: - ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> ref_count_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> ref_count_; // Reference counter. }; diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp index 2ae13815745..63c5586cc28 100644 --- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp @@ -54,7 +54,7 @@ void TAO_Strategized_Object_Proxy_Broker::create_proxy (TAO_ORB_Core::TAO_Collocation_Strategies strategy, CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD (ACE_SYNCH_MUTEX, + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h index fa6d2420deb..14d0ae0c2a4 100644 --- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h @@ -56,7 +56,7 @@ private: TAO_Object_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM]; - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; }; TAO_Strategized_Object_Proxy_Broker *the_tao_strategized_object_proxy_broker (void); diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index 29c2fb0fc9d..9213e247775 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -73,7 +73,7 @@ private: /// Protect the reference count, this is OK because we do no /// duplicates or releases on the critical path. - ACE_SYNCH_MUTEX refcount_mutex_; + TAO_SYNCH_MUTEX refcount_mutex_; #if defined (__GNUG__) // G++ (even 2.6.3) stupidly thinks instances can't be created. diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 992a2338d27..73beeadf18d 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -213,7 +213,7 @@ private: TAO_MProfile* forward_to_; /// Mutex to protect reference count. - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; /// Number of outstanding references to this object. CORBA::ULong refcount_; diff --git a/TAO/tao/Profile.i b/TAO/tao/Profile.i index 8a6ad57f4b8..0d6abd3d5a6 100644 --- a/TAO/tao/Profile.i +++ b/TAO/tao/Profile.i @@ -40,7 +40,7 @@ TAO_Profile::_incr_refcnt (void) // lock is automatically acquired (refcount_lock_). Then when // we leave this method the destructir for guard is called which // releases the lock! - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->refcount_lock_, 0); return this->refcount_++; } @@ -49,7 +49,7 @@ ACE_INLINE CORBA::ULong TAO_Profile::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->refcount_lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; diff --git a/TAO/tao/Single_Reactor.cpp b/TAO/tao/Single_Reactor.cpp index bbda8628814..242f11526f1 100644 --- a/TAO/tao/Single_Reactor.cpp +++ b/TAO/tao/Single_Reactor.cpp @@ -60,7 +60,7 @@ TAO_Single_Reactor::shutdown_all (void) TAO_Leader_Follower &leader_follower = this->leader_follower (); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, leader_follower.lock (), -1); diff --git a/TAO/tao/Strategies/Reactor_Per_Priority.cpp b/TAO/tao/Strategies/Reactor_Per_Priority.cpp index 44713d6bd1f..8c820ddc940 100644 --- a/TAO/tao/Strategies/Reactor_Per_Priority.cpp +++ b/TAO/tao/Strategies/Reactor_Per_Priority.cpp @@ -142,7 +142,7 @@ TAO_Reactor_Per_Priority::shutdown_all (void) TAO_Leader_Follower &leader_follower = *((*i).int_id_); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, leader_follower.lock (), -1); @@ -172,18 +172,18 @@ TAO_Reactor_Per_Priority::shutdown_all (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX>; -template class ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX>; -template class ACE_Map_Iterator_Base<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX>; -template class ACE_Map_Reverse_Iterator<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX>; +template class ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>; +template class ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>; +template class ACE_Map_Iterator_Base<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>; +template class ACE_Map_Reverse_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX>; template class ACE_Map_Entry<CORBA::Short,TAO_Leader_Follower*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX> #pragma instantiate ACE_Map_Entry<CORBA::Short,TAO_Leader_Follower*> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Strategies/Reactor_Per_Priority.h b/TAO/tao/Strategies/Reactor_Per_Priority.h index 7be077d65d1..50a4e209b1b 100644 --- a/TAO/tao/Strategies/Reactor_Per_Priority.h +++ b/TAO/tao/Strategies/Reactor_Per_Priority.h @@ -62,8 +62,8 @@ private: // implement all the other methods private: - typedef ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX> Map; - typedef ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,ACE_SYNCH_MUTEX> Map_Iterator; + typedef ACE_Map_Manager<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX> Map; + typedef ACE_Map_Iterator<CORBA::Short,TAO_Leader_Follower*,TAO_SYNCH_MUTEX> Map_Iterator; Map map_; // The map between priorities and the control structure for the diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index e14fb04834d..cc2711be54a 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -435,11 +435,11 @@ template class ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNE template class ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>; template class ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>; -template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*>; -template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; template class ACE_Auto_Basic_Array_Ptr<TAO_SHMIOP_Connection_Handler*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -451,11 +451,11 @@ template class ACE_Auto_Basic_Array_Ptr<TAO_SHMIOP_Connection_Handler*>; #pragma instantiate ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>; #pragma instantiate ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>; -#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SHMIOP_Connection_Handler*> diff --git a/TAO/tao/Strategies/TAO_Strategies_Internal.cpp b/TAO/tao/Strategies/TAO_Strategies_Internal.cpp index d6e814cc98e..f5fd25d8ad5 100644 --- a/TAO/tao/Strategies/TAO_Strategies_Internal.cpp +++ b/TAO/tao/Strategies/TAO_Strategies_Internal.cpp @@ -33,7 +33,7 @@ TAO_Strategies_Internal::open_services (int &argc, int ignore_default_svc_conf_file, int skip_service_config_open) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1)); + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1)); #if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP) ignore_default_svc_conf_file = 1; #endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */ @@ -83,7 +83,7 @@ TAO_Strategies_Internal::TAO_Strategies_Internal (void) int TAO_Strategies_Internal::close_services (void) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1)); --service_open_count_; return 0; diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 40709fcd058..ed83deb16ea 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -480,11 +480,11 @@ template class ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNE template class ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>; template class ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>; -template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*>; -template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; template class ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -503,11 +503,11 @@ template class ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler*>; #pragma instantiate ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR> #pragma instantiate ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> -#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler*> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index c8ebfcea742..86fc384ab72 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -526,7 +526,7 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC; typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR; -typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> LOCKED_MALLOC; +typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC; typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR; ACE_Allocator * diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 3bc9a10894a..2ecaa2e15ec 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -235,7 +235,7 @@ TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj) CORBA::ULong TAO_Stub::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->refcount_lock_, 0); @@ -247,7 +247,7 @@ CORBA::ULong TAO_Stub::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->refcount_lock_, 0); diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index f2e48fdfe1c..69ff268f467 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -410,7 +410,7 @@ private: size_t profile_success_; /// Mutex to protect reference count. - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; /// Number of outstanding references to this object. CORBA::ULong refcount_; diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h index c3bd6f114a8..331ed2fc8e5 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.h +++ b/TAO/tao/Synch_Reply_Dispatcher.h @@ -93,7 +93,7 @@ private: * that binds the Reply_Dispatcher to its transport, and then passed * to the Waiting_Strategy to do the signalling, if needed. */ - ACE_SYNCH_CONDITION *leader_follower_condition_variable_; + TAO_SYNCH_CONDITION *leader_follower_condition_variable_; }; #include "ace/post.h" diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 76dfd3a20b7..d6e8d1eb2e1 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -139,7 +139,7 @@ TAO_Internal::open_services_i (int &argc, int ignore_default_svc_conf_file, int skip_service_config_open) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1)); @@ -205,7 +205,7 @@ TAO_Internal::TAO_Internal (void) int TAO_Internal::close_services (void) { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1)); --service_open_count_; return 0; diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp index b82b3065a28..b4d00669282 100644 --- a/TAO/tao/TAO_Singleton_Manager.cpp +++ b/TAO/tao/TAO_Singleton_Manager.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "tao/orbconf.h" #include "ace/Object_Manager.h" #include "ace/Log_Msg.h" #include "ace/Synch.h" @@ -34,7 +35,7 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void) exit_info_ (), registered_with_object_manager_ (-1) #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - , internal_lock_ (new ACE_Recursive_Thread_Mutex) + , internal_lock_ (new TAO_SYNCH_RECURSIVE_MUTEX) # endif /* ACE_MT_SAFE */ { // Be sure that no further instances are created via instance (). @@ -268,7 +269,7 @@ TAO_Singleton_Manager::at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, *instance_->internal_lock_, -1)); if (this->shutting_down_i ()) diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index f0233eab8ec..1b4a1507586 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -30,7 +30,7 @@ #include "ace/OS.h" // Forward declarations -class ACE_Recursive_Thread_Mutex; +class TAO_SYNCH_RECURSIVE_MUTEX; // Adapter for cleanup, used to register cleanup function with the // ACE_Object_Manager. @@ -180,7 +180,7 @@ private: #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) /// Lock that is used to guard internal structures. - ACE_Recursive_Thread_Mutex *internal_lock_; + TAO_SYNCH_RECURSIVE_MUTEX *internal_lock_; #endif /* ACE_MT_SAFE */ }; diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index cbac6b18bcb..98bcc63b319 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -210,7 +210,7 @@ TAO_Transport::idle_after_reply (void) return this->tms ()->idle_after_reply (); } -ACE_SYNCH_CONDITION * +TAO_SYNCH_CONDITION * TAO_Transport::leader_follower_condition_variable (void) { return this->wait_strategy ()->leader_follower_condition_variable (); diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index 9d3de85ee04..2b5484a5abd 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -193,7 +193,7 @@ public: * Wait Strategy. Muxed Leader Follower implementation returns a * valid condition variable, others return 0. */ - virtual ACE_SYNCH_CONDITION *leader_follower_condition_variable (void); + virtual TAO_SYNCH_CONDITION *leader_follower_condition_variable (void); /// Queue for buffering transport messages. virtual TAO_Transport_Buffering_Queue &buffering_queue (void); diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 75013ec570e..711e71b0b35 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -1395,7 +1395,7 @@ CORBA_TypeCode::private_id (CORBA::Environment &ACE_TRY_ENV) const case CORBA::tk_except: { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_id_known_) return this->private_state_->tc_id_; @@ -1434,7 +1434,7 @@ CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const case CORBA::tk_except: { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_name_known_) return this->private_state_->tc_name_; @@ -1482,7 +1482,7 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const case CORBA::tk_struct: { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_member_count_known_) return this->private_state_->tc_member_count_; @@ -1506,7 +1506,7 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const case CORBA::tk_union: { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_member_count_known_) return this->private_state_->tc_member_count_; @@ -1561,7 +1561,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot, { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_member_type_list_known_) if (slot < mcount) @@ -1617,7 +1617,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot, { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_member_type_list_known_) if (slot < mcount) @@ -1707,7 +1707,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot, ACE_CHECK_RETURN ((char *)0); // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_member_name_list_known_) @@ -1875,7 +1875,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, } // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_member_label_list_known_) if (n < member_count) @@ -1980,7 +1980,7 @@ CORBA_TypeCode::private_discriminator_type ( ) const { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); return this->private_discriminator_type_i (ACE_TRY_ENV); @@ -2017,7 +2017,7 @@ CORBA::Long CORBA_TypeCode::private_default_index (CORBA::Environment &ACE_TRY_ENV) const { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_default_index_used_known_) return this->private_state_->tc_default_index_used_; @@ -2048,7 +2048,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &ACE_TRY_ENV) const case CORBA::tk_array: { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_length_known_) return this->private_state_->tc_length_; @@ -2069,7 +2069,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &ACE_TRY_ENV) const case CORBA::tk_wstring: { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_length_known_) return this->private_state_->tc_length_; @@ -2101,7 +2101,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const case CORBA::tk_array: { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_content_type_known_) return this->private_state_->tc_content_type_; @@ -2121,7 +2121,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const case CORBA::tk_alias: { // Double checked locking... - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->private_state_->mutex_, 0); if (this->private_state_->tc_content_type_known_) return this->private_state_->tc_content_type_; diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index aaac251ade8..5ea8b38ce99 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -436,7 +436,7 @@ private: /// Protect the reference count, this is OK because we do no /// duplicates or releases on the critical path. - ACE_SYNCH_MUTEX refcount_lock_; + TAO_SYNCH_MUTEX refcount_lock_; /// TAO's approach differs from the SunSoft IIOP. Constant typecodes /// are owned by the ORB and get freed only when the ORB dies. @@ -488,7 +488,7 @@ public: /// destructor ~TC_Private_State (void); - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; /// our kind that will determine what kind of children we may have CORBA::TCKind tc_kind_; diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i index 8f78b625b86..bee69e76c59 100644 --- a/TAO/tao/Typecode.i +++ b/TAO/tao/Typecode.i @@ -4,7 +4,7 @@ ACE_INLINE CORBA::ULong CORBA_TypeCode::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->refcount_lock_, 0); return this->refcount_++; } @@ -12,7 +12,7 @@ ACE_INLINE CORBA::ULong CORBA_TypeCode::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->refcount_lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h index 05bc6fe1e7b..ed00ed99ca1 100644 --- a/TAO/tao/ValueBase.h +++ b/TAO/tao/ValueBase.h @@ -123,7 +123,7 @@ private: private: // data CORBA::ULong _tao_reference_count_; - ACE_SYNCH_MUTEX _tao_reference_count_lock_; + TAO_SYNCH_MUTEX _tao_reference_count_lock_; }; // CORBA_DefaultValueRefCountBase // %! which lock has the lowest memory overhead ? diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i index cb17c79c899..38ce044122b 100644 --- a/TAO/tao/ValueBase.i +++ b/TAO/tao/ValueBase.i @@ -39,7 +39,7 @@ CORBA_DefaultValueRefCountBase::CORBA_DefaultValueRefCountBase (void) ACE_INLINE void CORBA_DefaultValueRefCountBase::_tao_add_ref (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_); ++_tao_reference_count_; } @@ -47,7 +47,7 @@ ACE_INLINE void CORBA_DefaultValueRefCountBase::_tao_remove_ref (void) { { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_); -- this->_tao_reference_count_; if (this->_tao_reference_count_ != 0) return; @@ -61,7 +61,7 @@ CORBA_DefaultValueRefCountBase::_tao_remove_ref (void) ACE_INLINE CORBA::ULong CORBA_DefaultValueRefCountBase::_tao_refcount_value (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_,0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_,0); return _tao_reference_count_; } diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h index f7218edacab..6e13a719c95 100644 --- a/TAO/tao/ValueFactory.h +++ b/TAO/tao/ValueFactory.h @@ -49,7 +49,7 @@ public: private: CORBA::ULong _tao_reference_count_; - ACE_SYNCH_MUTEX _tao_reference_count_lock_; + TAO_SYNCH_MUTEX _tao_reference_count_lock_; }; // CORBA_ValueFactoryBase diff --git a/TAO/tao/ValueFactory.i b/TAO/tao/ValueFactory.i index 84d4da93833..805374eadfb 100644 --- a/TAO/tao/ValueFactory.i +++ b/TAO/tao/ValueFactory.i @@ -9,7 +9,7 @@ CORBA_ValueFactoryBase::CORBA_ValueFactoryBase () ACE_INLINE void CORBA_ValueFactoryBase::_add_ref (void) { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_); ++_tao_reference_count_; } @@ -17,7 +17,7 @@ ACE_INLINE void CORBA_ValueFactoryBase::_remove_ref (void) { { - ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_); -- this->_tao_reference_count_; if (this->_tao_reference_count_ != 0) return; diff --git a/TAO/tao/ValueFactory_Map.cpp b/TAO/tao/ValueFactory_Map.cpp index 8af029138bc..13eea5d0967 100644 --- a/TAO/tao/ValueFactory_Map.cpp +++ b/TAO/tao/ValueFactory_Map.cpp @@ -57,7 +57,7 @@ int TAO_ValueFactory_Map::rebind (const char *repo_id, CORBA_ValueFactory_ptr &factory) { -// ACE_READ_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, guard, map_->mutex(),-1); +// ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX, guard, map_->mutex(),-1); // --- but must be recursive const char *prev_repo_id; CORBA_ValueFactory_ptr prev_factory; @@ -121,20 +121,20 @@ TAO_ValueFactory_Map::find (const char *repo_id, #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>; +template class ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>; template class ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr>; -template class TAO_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>; +template class TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX> #pragma instantiate ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr> -#pragma instantiate TAO_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX> +#pragma instantiate TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ValueFactory_Map.h b/TAO/tao/ValueFactory_Map.h index 1d31f872f4e..b1ec129edc3 100644 --- a/TAO/tao/ValueFactory_Map.h +++ b/TAO/tao/ValueFactory_Map.h @@ -63,7 +63,7 @@ private: CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, - ACE_SYNCH_RW_MUTEX> + TAO_SYNCH_RW_MUTEX> FACTORY_MAP_MANAGER; FACTORY_MAP_MANAGER map_; }; /* TAO_ValueFactory_Map */ @@ -71,7 +71,7 @@ private: // currently the ValueFactory_Map is a singleton and not per ORB // as in the OMG specs -typedef TAO_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX> +typedef TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> TAO_VALUEFACTORY_MAP; diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp index 35387aef6bd..7a5e7dbade1 100644 --- a/TAO/tao/Wait_On_Leader_Follower.cpp +++ b/TAO/tao/Wait_On_Leader_Follower.cpp @@ -56,7 +56,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, orb_core->leader_follower (); // Obtain the lock. - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, leader_follower.lock (), -1); // Optmize the first iteration [no access to errno] @@ -82,7 +82,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, // = Wait as a follower. // Grab the condtion variable. - ACE_SYNCH_CONDITION* cond = + TAO_SYNCH_CONDITION* cond = orb_core->leader_follower_condition_variable (); if (TAO_debug_level >= 5) @@ -194,7 +194,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, ACE_UNUSED_ARG (client_leader_thread_helper); { - ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_MUTEX>, rev_mon, + ACE_GUARD_RETURN (ACE_Reverse_Lock<TAO_SYNCH_MUTEX>, rev_mon, leader_follower.reverse_lock (), -1); // Become owner of the reactor. @@ -284,7 +284,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, return result; } -ACE_SYNCH_CONDITION * +TAO_SYNCH_CONDITION * TAO_Wait_On_Leader_Follower::leader_follower_condition_variable (void) { return this->transport_->orb_core ()->leader_follower_condition_variable (); @@ -292,7 +292,7 @@ TAO_Wait_On_Leader_Follower::leader_follower_condition_variable (void) int TAO_Wait_On_Leader_Follower::reply_dispatched (int &reply_received_flag, - ACE_SYNCH_CONDITION *condition) + TAO_SYNCH_CONDITION *condition) { if (condition == 0) return 0; @@ -301,7 +301,7 @@ TAO_Wait_On_Leader_Follower::reply_dispatched (int &reply_received_flag, this->transport_->orb_core ()->leader_follower (); // Obtain the lock. - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, leader_follower.lock (), -1); @@ -324,7 +324,7 @@ TAO_Wait_On_Leader_Follower::reply_dispatched (int &reply_received_flag, void TAO_Wait_On_Leader_Follower::connection_closed (int &reply_received_flag, - ACE_SYNCH_CONDITION *condition) + TAO_SYNCH_CONDITION *condition) { if (condition == 0) return; @@ -333,7 +333,7 @@ TAO_Wait_On_Leader_Follower::connection_closed (int &reply_received_flag, this->transport_->orb_core ()->leader_follower (); // Obtain the lock. - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, leader_follower.lock ()); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, leader_follower.lock ()); reply_received_flag = -1; diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h index 32b338e2935..179964fde68 100644 --- a/TAO/tao/Wait_On_Leader_Follower.h +++ b/TAO/tao/Wait_On_Leader_Follower.h @@ -52,9 +52,9 @@ public: int &reply_received); virtual int register_handler (void); virtual int non_blocking (void); - virtual ACE_SYNCH_CONDITION *leader_follower_condition_variable (void); - virtual int reply_dispatched (int &, ACE_SYNCH_CONDITION *); - virtual void connection_closed (int &, ACE_SYNCH_CONDITION *); + virtual TAO_SYNCH_CONDITION *leader_follower_condition_variable (void); + virtual int reply_dispatched (int &, TAO_SYNCH_CONDITION *); + virtual void connection_closed (int &, TAO_SYNCH_CONDITION *); }; #include "ace/post.h" diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp index d43738ae16f..aaeab43e5ab 100644 --- a/TAO/tao/Wait_Strategy.cpp +++ b/TAO/tao/Wait_Strategy.cpp @@ -22,7 +22,7 @@ TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */, return 0; } -ACE_SYNCH_CONDITION * +TAO_SYNCH_CONDITION * TAO_Wait_Strategy::leader_follower_condition_variable (void) { return 0; @@ -30,7 +30,7 @@ TAO_Wait_Strategy::leader_follower_condition_variable (void) int TAO_Wait_Strategy::reply_dispatched (int &reply_received, - ACE_SYNCH_CONDITION *) + TAO_SYNCH_CONDITION *) { // In most implementations of this strategy there is no need to // acquire any mutex to set the reply_received flag. @@ -40,7 +40,7 @@ TAO_Wait_Strategy::reply_dispatched (int &reply_received, void TAO_Wait_Strategy::connection_closed (int &reply_received, - ACE_SYNCH_CONDITION*) + TAO_SYNCH_CONDITION*) { // In most implementations of this strategy there is no need to // acquire any mutex to set the reply_received flag. diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index 9f88dae024b..b57b70b27c5 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -71,7 +71,7 @@ public: * passes this condition variable back to Waiting_Strategy, that can * then signal the waiting thread if needed. */ - virtual ACE_SYNCH_CONDITION *leader_follower_condition_variable (void); + virtual TAO_SYNCH_CONDITION *leader_follower_condition_variable (void); /** * This is the callback used by the Reply_Dispatcher to inform the @@ -82,7 +82,7 @@ public: * whatever locks it needs. */ virtual int reply_dispatched (int &reply_received_flag, - ACE_SYNCH_CONDITION *); + TAO_SYNCH_CONDITION *); /** * The connection has been closed by the lower level components in @@ -90,7 +90,7 @@ public: * The wait has finished and must result in an error. */ virtual void connection_closed (int &reply_received_flag, - ACE_SYNCH_CONDITION*); + TAO_SYNCH_CONDITION*); protected: /// Transport object. diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index c7ac53c60de..a74f2521c72 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -140,7 +140,7 @@ TAO_Default_Client_Strategy_Factory::create_profile_lock (void) 0); else ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (), + ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (), 0); return the_lock; @@ -201,7 +201,7 @@ TAO_Default_Client_Strategy_Factory::create_ft_service_retention_id_lock (void) ACE_Lock *the_lock = 0; ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX>, + ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0); return the_lock; diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index d0c2e1a0bf4..eb39187d3ba 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -588,7 +588,7 @@ TAO_Default_Resource_Factory::reclaim_reactor (ACE_Reactor *reactor) typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC; typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR; -typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> LOCKED_MALLOC; +typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC; typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR; ACE_Allocator * @@ -652,7 +652,7 @@ TAO_Default_Resource_Factory::create_cached_connection_lock (void) 0); else ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_MUTEX>, + ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, 0); return the_lock; diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index a554ba828f7..6e6d9467a6d 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -72,7 +72,7 @@ TAO_Default_Server_Strategy_Factory::create_event_loop_lock (void) 0); else ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX>, + ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX>, 0); return the_lock; diff --git a/TAO/tao/diffs/MessagingC.cpp.diff b/TAO/tao/diffs/MessagingC.cpp.diff index 07409a6dffe..3395df6dd1c 100644 --- a/TAO/tao/diffs/MessagingC.cpp.diff +++ b/TAO/tao/diffs/MessagingC.cpp.diff @@ -759,9 +759,9 @@ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class ACE_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >; + template class ACE_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> + #pragma instantiate ACE_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - + diff --git a/TAO/tao/diffs/MessagingC.h.diff b/TAO/tao/diffs/MessagingC.h.diff index c22f5e97ca9..d6d8e16f6a7 100644 --- a/TAO/tao/diffs/MessagingC.h.diff +++ b/TAO/tao/diffs/MessagingC.h.diff @@ -1621,7 +1621,7 @@ public: - + - friend class ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; + friend class ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; - + int register_proxy_factory ( @@ -1653,12 +1653,12 @@ @@ -2502,11 +2569,11 @@ TAO_Messaging_ReplyHandler_Default_Proxy_Factory *proxy_factory_; int delete_proxy_factory_; - ACE_SYNCH_RECURSIVE_MUTEX lock_; + TAO_SYNCH_RECURSIVE_MUTEX lock_; - + }; - typedef ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER; + typedef ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER; - + class TAO_Export TAO_Messaging_ReplyHandler_Smart_Proxy_Base diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index c79328b428b..9810ac00a10 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -35,6 +35,23 @@ #define TAO_NULL_LOCK_REACTOR ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > #endif /* TAO_NULL_LOCK_REACTOR */ +// Define this to modify the default mutex type used throughout TAO. +#if !defined (TAO_SYNCH_MUTEX) +#define TAO_SYNCH_MUTEX ACE_SYNCH_MUTEX +#endif /* TAO_SYNCH_MUTEX */ + +#if !defined (TAO_SYNCH_RECURSIVE_MUTEX) +#define TAO_SYNCH_RECURSIVE_MUTEX ACE_SYNCH_RECURSIVE_MUTEX +#endif /* TAO_SYNCH_RECURSIVE_MUTEX */ + +#if !defined (TAO_SYNCH_RW_MUTEX) +#define TAO_SYNCH_RW_MUTEX ACE_SYNCH_RW_MUTEX +#endif /* TAO_SYNCH_RW_MUTEX */ + +#if !defined (TAO_SYNCH_CONDITION) +#define TAO_SYNCH_CONDITION ACE_SYNCH_CONDITION +#endif /* TAO_SYNCH_CONDITION */ + // Define this if you don't want POA timestamps in the IOR. Remember, // without timestamps, transient and persistent POA cannot be // distinguished diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index 153858d6192..d712fbff103 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -117,7 +117,7 @@ public: ACE_Time_Value sleep_for_this_thread; { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); this->work_so_far_ += remote_work / number_of_client_threads; work_from_this_thread = this->work_so_far_; @@ -167,7 +167,7 @@ private: u_long work_so_far_; // Work counter. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock for work counter. u_long sleep_; @@ -192,7 +192,7 @@ public: u_long event_loop_timeout_for_this_thread = 0; { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); this->event_loop_timeout_so_far_ += event_loop_timeout / number_of_event_loop_threads; event_loop_timeout_for_this_thread = this->event_loop_timeout_so_far_; @@ -232,7 +232,7 @@ private: u_long event_loop_timeout_so_far_; // Event loop timeout counter. - ACE_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; // Lock for event loop timeout counter. }; diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index 7f7c5008d22..9d7ed3b8390 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -57,7 +57,7 @@ Worker::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - ACE_SYNCH_MUTEX mutex; + TAO_SYNCH_MUTEX mutex; int pending_requests = 2; Test::AMI_ControllerHandler_var handler; @@ -92,7 +92,7 @@ Worker::svc (void) ACE_Time_Value tv (0, 1000 * this->milliseconds_); this->orb_->run (tv); - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, mutex, -1); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1); if (pending_requests == 0) break; } @@ -108,7 +108,7 @@ Worker::svc (void) // **************************************************************** -Controller_Handler::Controller_Handler (ACE_SYNCH_MUTEX *mutex, +Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex, int *pending_replies) : mutex_ (mutex) , pending_replies_ (pending_replies) @@ -119,7 +119,7 @@ void Controller_Handler::worker_started (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, *this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); (*this->pending_replies_)--; } @@ -147,7 +147,7 @@ void Controller_Handler::worker_finished (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, *this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); (*this->pending_replies_)--; } diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index 0ce7d46a5d9..f532c652979 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -68,7 +68,7 @@ class Controller_Handler , public virtual PortableServer::RefCountServantBase { public: - Controller_Handler (ACE_SYNCH_MUTEX *mutex, + Controller_Handler (TAO_SYNCH_MUTEX *mutex, int *pending_replies); // Constructor @@ -84,7 +84,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); private: - ACE_SYNCH_MUTEX *mutex_; + TAO_SYNCH_MUTEX *mutex_; int *pending_replies_; // The pending replies is decremented each time a reply is // received. diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp index 759a6169192..a9bbc43502e 100644 --- a/TAO/tests/LongUpcalls/Controller.cpp +++ b/TAO/tests/LongUpcalls/Controller.cpp @@ -14,7 +14,7 @@ Controller::Controller (void) void Controller::dump_results () { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->start_count_ != this->finish_count_) { ACE_ERROR ((LM_ERROR, @@ -27,7 +27,7 @@ void Controller::worker_started (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->start_count_++; // ACE_DEBUG ((LM_DEBUG, "Received worker start report\n")); @@ -37,7 +37,7 @@ void Controller::worker_finished (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->finish_count_++; // ACE_DEBUG ((LM_DEBUG, "Received worker completion report\n")); diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h index 5982f8afa97..f2378a291b4 100644 --- a/TAO/tests/LongUpcalls/Controller.h +++ b/TAO/tests/LongUpcalls/Controller.h @@ -32,7 +32,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); private: - ACE_SYNCH_MUTEX mutex_; + TAO_SYNCH_MUTEX mutex_; CORBA::ULong start_count_; CORBA::ULong finish_count_; }; diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp index f9a6947289d..b01f15f1cfd 100644 --- a/TAO/tests/Param_Test/helper.cpp +++ b/TAO/tests/Param_Test/helper.cpp @@ -120,7 +120,7 @@ Generator::gen_step (void) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX>; +template class ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h index 40f34ebc344..b1bc3561de7 100644 --- a/TAO/tests/Param_Test/helper.h +++ b/TAO/tests/Param_Test/helper.h @@ -45,5 +45,5 @@ public: Param_Test::Step step_; }; -typedef ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX> GENERATOR; +typedef ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX> GENERATOR; #endif /* HELPER_H */ diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp index 725e0eeb5e6..2e57e28a9d2 100644 --- a/TAO/tests/Param_Test/options.cpp +++ b/TAO/tests/Param_Test/options.cpp @@ -238,7 +238,7 @@ Options::shutdown (void) const } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>; +template class ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> +#pragma instantiate ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h index 26738972170..8e93cd4fa73 100644 --- a/TAO/tests/Param_Test/options.h +++ b/TAO/tests/Param_Test/options.h @@ -128,6 +128,6 @@ private: // server shutdown flag. }; -typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS; +typedef ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX> OPTIONS; #endif /* OPTIONS_H */ |