diff options
Diffstat (limited to 'ACE/protocols')
22 files changed, 112 insertions, 93 deletions
diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h index 2cb7febf4dc..0f6a1ba492a 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.h +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h @@ -19,7 +19,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/INET_Addr.h" -#include "ace/Synch.h" #include "ace/SString.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp index 48d897875b0..93b2b67da6d 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp @@ -13,13 +13,14 @@ #include "HTBP_Channel.inl" #endif -#include "HTBP_Session.h" -#include "HTBP_Filter_Factory.h" - #include "ace/Message_Block.h" -#include "ace/Reactor.h" #include "ace/os_include/netinet/os_tcp.h" #include "ace/OS_NS_time.h" +#include "ace/Reactor.h" +#include "ace/Synch.h" + +#include "HTBP_Session.h" +#include "HTBP_Filter_Factory.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.h b/ACE/protocols/ace/HTBP/HTBP_Channel.h index 87f2dd7785a..30f895b32d8 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.h +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h @@ -12,6 +12,7 @@ #define ACE_HTBP_CHANNEL_H #include /**/ "ace/pre.h" +#include "ace/INET_Addr.h" #include "ace/SOCK_Stream.h" #include "ace/Message_Block.h" diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp index dd32c94e668..4337dd04eb5 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Filter.cpp @@ -1,13 +1,13 @@ -#include "ace/Log_Msg.h" - -#include "HTBP_Session.h" #include "HTBP_Filter.h" #if !defined (__ACE_INLINE__) #include "HTBP_Filter.inl" #endif +#include "ace/Log_Msg.h" +#include "ace/Synch.h" +#include "HTBP_Session.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp index 82cf2d324ad..16d90ee08de 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp @@ -1,13 +1,15 @@ -// ACE_HTBP_Filter.cpp -#include "ace/Log_Msg.h" -#include "ace/OS_NS_stdio.h" -#include "HTBP_Session.h" #include "HTBP_Inside_Squid_Filter.h" #if !defined (__ACE_INLINE__) #include "HTBP_Inside_Squid_Filter.inl" #endif +#include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" +#include "ace/Synch.h" + +#include "HTBP_Session.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL ssize_t diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp index 568dd8b4b25..f9096ce13e9 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp @@ -8,9 +8,12 @@ */ //============================================================================= #include "HTBP_Notifier.h" + +#include "ace/Reactor.h" +#include "ace/Synch.h" + #include "HTBP_Channel.h" #include "HTBP_Session.h" -#include "ace/Reactor.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp index 61d50294456..e024f6fa75b 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp @@ -1,12 +1,14 @@ -#include "ace/Log_Msg.h" - -#include "HTBP_Session.h" #include "HTBP_Outside_Squid_Filter.h" #if !defined (__ACE_INLINE__) #include "HTBP_Outside_Squid_Filter.inl" #endif +#include "ace/Log_Msg.h" +#include "ace/Synch.h" + +#include "HTBP_Session.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL ssize_t diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp index 8bda293fe52..9ae6025601a 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp @@ -1,17 +1,18 @@ -// SOCK_Stream.cpp -#include "ace/Log_Msg.h" - +#include "ace/Synch.h" #include "HTBP_Session.h" -#include "ace/SOCK_Connector.h" -#include "ace/Event_Handler.h" -#include "ace/os_include/netinet/os_tcp.h" -#include "HTBP_Filter.h" -#include "HTBP_ID_Requestor.h" #if !defined (__ACE_INLINE__) #include "HTBP_Session.inl" #endif +#include "ace/Event_Handler.h" +#include "ace/Log_Msg.h" +#include "ace/os_include/netinet/os_tcp.h" +#include "ace/SOCK_Connector.h" + +#include "HTBP_Filter.h" +#include "HTBP_ID_Requestor.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE::HTBP::Session::Session_Map ACE::HTBP::Session::session_map_; diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.h b/ACE/protocols/ace/HTBP/HTBP_Session.h index 7098bf0b8fa..aecdfe22e1e 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.h +++ b/ACE/protocols/ace/HTBP/HTBP_Session.h @@ -12,10 +12,10 @@ #define ACE_HTBP_SESSION_H #include /**/ "ace/pre.h" -#include "ace/SOCK_IO.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" #include "ace/Message_Queue.h" +#include "ace/SOCK_IO.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp index 77e7a3415b0..f14c8e003f6 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp @@ -9,10 +9,11 @@ //============================================================================= #include "HTBP_Stream.h" -#include "HTBP_Session.h" -#include "HTBP_Filter_Factory.h" - #include "ace/Message_Block.h" +#include "ace/Synch.h" + +#include "HTBP_Filter_Factory.h" +#include "HTBP_Session.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/protocols/ace/TMCast/LinkListener.hpp b/ACE/protocols/ace/TMCast/LinkListener.hpp index 76944d9d4c9..7e4de5ba688 100644 --- a/ACE/protocols/ace/TMCast/LinkListener.hpp +++ b/ACE/protocols/ace/TMCast/LinkListener.hpp @@ -1,12 +1,11 @@ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> // OS primitives -#include <ace/OS_NS_string.h> -#include <ace/OS_NS_stdlib.h> -#include <ace/Synch.h> -#include <ace/SOCK_Dgram_Mcast.h> -#include <ace/Refcounted_Auto_Ptr.h> - +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/Refcounted_Auto_Ptr.h" +#include "ace/SOCK_Dgram_Mcast.h" +#include "ace/Synch_Traits.h" #include "Messaging.hpp" #include "Protocol.hpp" @@ -150,7 +149,7 @@ namespace ACE_TMCast private: // FUZZ: disable check_for_ACE_Guard - typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; + typedef ACE_Guard<ACE_SYNCH_MUTEX> AutoLock; // FUZZ: enable check_for_ACE_Guard ACE_hthread_t thread_; diff --git a/ACE/protocols/ace/TMCast/Messaging.hpp b/ACE/protocols/ace/TMCast/Messaging.hpp index 883f52273e5..f4046f0c68b 100644 --- a/ACE/protocols/ace/TMCast/Messaging.hpp +++ b/ACE/protocols/ace/TMCast/Messaging.hpp @@ -3,8 +3,8 @@ #ifndef TMCAST_MESSAGING_HPP #define TMCAST_MESSAGING_HPP -#include <ace/Synch.h> -#include <ace/Bound_Ptr.h> +#include "ace/Bound_Ptr.h" +#include "ace/Synch_Traits.h" #include "MTQueue.hpp" @@ -22,7 +22,7 @@ namespace ACE_TMCast MessagePtr; typedef - MTQueue<MessagePtr, ACE_Thread_Mutex, ACE_Condition<ACE_Thread_Mutex> > + MTQueue<MessagePtr, ACE_SYNCH_MUTEX, ACE_SYNCH_CONDITION > MessageQueue; struct MessageQueueAutoLock diff --git a/ACE/protocols/ace/TMCast/TransactionController.hpp b/ACE/protocols/ace/TMCast/TransactionController.hpp index 43ff7a9ee8c..57c601749ba 100644 --- a/ACE/protocols/ace/TMCast/TransactionController.hpp +++ b/ACE/protocols/ace/TMCast/TransactionController.hpp @@ -1,9 +1,9 @@ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> +#include "ace/Bound_Ptr.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdlib.h" -#include "ace/Synch.h" -#include "ace/Bound_Ptr.h" +#include "ace/Synch_Traits.h" #include "Protocol.hpp" #include "Messaging.hpp" @@ -366,7 +366,7 @@ namespace ACE_TMCast private: // FUZZ: disable check_for_ACE_Guard - typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; + typedef ACE_Guard<ACE_SYNCH_MUTEX> AutoLock; // FUZZ: enable check_for_ACE_Guard // bool trace_; diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp index 4716ef081c4..1bb12a01271 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp @@ -2,9 +2,11 @@ * client for a reactor based connection establishment test using HTBP */ -#include "ace/Log_Msg.h" #include "ace/Get_Opt.h" +#include "ace/Log_Msg.h" +#include "ace/OS.h" #include "ace/OS_NS_sys_socket.h" +#include "ace/Synch.h" #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_Stream.h" diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp index d2bc3bb661a..a24011b9fa4 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp @@ -2,21 +2,21 @@ * server for a reactor based connection establishment test using HTBP */ -#include "ace/Log_Msg.h" - -#include "ace/HTBP/HTBP_Session.h" -#include "ace/HTBP/HTBP_Stream.h" -#include "ace/HTBP/HTBP_Addr.h" - -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Stream.h" -#include "ace/Event_Handler.h" -#include "ace/Reactor.h" #include "ace/Get_Opt.h" +#include "ace/Event_Handler.h" +#include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_socket.h" #include "ace/os_include/os_netdb.h" +#include "ace/Reactor.h" +#include "ace/SOCK_Acceptor.h" +#include "ace/SOCK_Stream.h" +#include "ace/Synch.h" + +#include "ace/HTBP/HTBP_Session.h" +#include "ace/HTBP/HTBP_Stream.h" +#include "ace/HTBP/HTBP_Addr.h" unsigned port = 8088; const ACE_TCHAR *notifier_file = 0; diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h index 3567e4c897f..b46468ecb4f 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -31,10 +31,11 @@ // This first #undef protects against command-line definitions. #undef ACE_NDEBUG #include "ace/streams.h" -#include "ace/Singleton.h" -#include "ace/Synch.h" -#include "ace/Log_Msg.h" + #include "ace/ACE.h" +#include "ace/Log_Msg.h" +#include "ace/Singleton.h" +#include "ace/Synch_Traits.h" // The second #undef protects against being reset in a config.h file. #undef ACE_NDEBUG @@ -303,7 +304,7 @@ randomize (int array[], size_t size) } } -typedef ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex> ace_file_stream; +typedef ACE_Singleton<ACE_Test_Output, ACE_NULL_MUTEX> ace_file_stream; #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex> * diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp index cfe26926333..1b94d1fe166 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp +++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp @@ -1,13 +1,14 @@ +#include "ace/Get_Opt.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/Synch.h" + #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Addr.h" #include "ace/HTBP/HTBP_ID_Requestor.h" #include "ace/HTBP/HTBP_Environment.h" -#include "ace/Log_Msg.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_sys_socket.h" - const ssize_t Send_Size = 4*1024; const size_t Loops = 10; const size_t Total_Size = Send_Size * Loops; diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp index 2e43f9bfba4..7ece62a7e7c 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp +++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp @@ -1,16 +1,17 @@ -#include "ace/Log_Msg.h" #include "ace/Get_Opt.h" +#include "ace/Log_Msg.h" +#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/os_include/os_netdb.h" +#include "ace/SOCK_Acceptor.h" +#include "ace/SOCK_Stream.h" +#include "ace/Synch.h" #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Addr.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Stream.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_sys_socket.h" -#include "ace/os_include/os_netdb.h" - const size_t Send_Size = 4*1024; const size_t Loops = 10; const size_t Total_Size = Send_Size * Loops; diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp index 23a8d837836..5f02b2e0c91 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp +++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp @@ -16,19 +16,20 @@ */ //============================================================================= - -#include "ace/HTBP/HTBP_Stream.h" -#include "ace/HTBP/HTBP_Session.h" -#include "ace/HTBP/HTBP_ID_Requestor.h" -#include "ace/HTBP/HTBP_Environment.h" - +#include "ace/Get_Opt.h" +#include "ace/OS.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/Synch.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_sys_socket.h" + +#include "ace/HTBP/HTBP_Stream.h" +#include "ace/HTBP/HTBP_Session.h" +#include "ace/HTBP/HTBP_ID_Requestor.h" +#include "ace/HTBP/HTBP_Environment.h" // Change to non-zero if test fails static int Test_Result = 0; diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp index 05e2bf4c069..7e7a95e8596 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp +++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp @@ -16,22 +16,23 @@ */ //============================================================================= +#include "ace/Get_Opt.h" +#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/os_include/os_netdb.h" +#include "ace/SOCK_Connector.h" +#include "ace/SOCK_Acceptor.h" +#include "ace/SOCK_Stream.h" +#include "ace/Synch.h" +#include "ace/Thread.h" +#include "ace/Thread_Manager.h" #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_ID_Requestor.h" #include "ace/HTBP/HTBP_Environment.h" -#include "ace/Thread.h" -#include "ace/Thread_Manager.h" -#include "ace/SOCK_Connector.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Stream.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_sys_socket.h" -#include "ace/os_include/os_netdb.h" - // Change to non-zero if test fails static int Test_Result = 0; diff --git a/ACE/protocols/tests/HTBP/ping/client.cpp b/ACE/protocols/tests/HTBP/ping/client.cpp index 6ae5ff57fd2..cde6ee3a0cd 100644 --- a/ACE/protocols/tests/HTBP/ping/client.cpp +++ b/ACE/protocols/tests/HTBP/ping/client.cpp @@ -5,8 +5,10 @@ #include "ace/ACE.h" #include "ace/Log_Msg.h" #include "ace/Get_Opt.h" +#include "ace/OS.h" #include "ace/OS_NS_sys_socket.h" #include "ace/os_include/os_netdb.h" +#include "ace/Synch.h" #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_Stream.h" diff --git a/ACE/protocols/tests/HTBP/ping/server.cpp b/ACE/protocols/tests/HTBP/ping/server.cpp index e0a52fba7eb..f4752a202ca 100644 --- a/ACE/protocols/tests/HTBP/ping/server.cpp +++ b/ACE/protocols/tests/HTBP/ping/server.cpp @@ -2,19 +2,20 @@ * server for a basic connection establishment test using HTBP */ +#include "ace/Get_Opt.h" #include "ace/Log_Msg.h" +#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/os_include/os_netdb.h" +#include "ace/SOCK_Acceptor.h" +#include "ace/SOCK_Stream.h" +#include "ace/Synch.h" #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Addr.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/SOCK_Stream.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_sys_socket.h" -#include "ace/os_include/os_netdb.h" - unsigned port = 8088; const ACE_TCHAR *notifier_file = 0; int |