diff options
Diffstat (limited to 'ACE/protocols')
22 files changed, 90 insertions, 106 deletions
diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h index 0f6a1ba492a..2cb7febf4dc 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.h +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h @@ -19,6 +19,7 @@ #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 ecf18953dc9..4547109ab46 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp @@ -13,15 +13,14 @@ #include "HTBP_Channel.inl" #endif +#include "HTBP_Session.h" +#include "HTBP_Filter_Factory.h" + #include "ace/Auto_Ptr.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 30f895b32d8..87f2dd7785a 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.h +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h @@ -12,7 +12,6 @@ #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 4337dd04eb5..dd32c94e668 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 36493c0b439..6e7e81b1316 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp @@ -2,7 +2,6 @@ #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" -#include "ace/Synch.h" #include "HTBP_Session.h" #include "HTBP_Inside_Squid_Filter.h" @@ -10,11 +9,6 @@ #include "HTBP_Inside_Squid_Filter.inl" #endif -#include "ace/Log_Msg.h" -#include "ace/OS_NS_stdio.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 f9096ce13e9..568dd8b4b25 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp @@ -8,12 +8,9 @@ */ //============================================================================= #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 e024f6fa75b..61d50294456 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp @@ -1,14 +1,12 @@ +#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 b62a6923424..8bb83f3b66f 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp @@ -1,19 +1,19 @@ -#include "ace/Synch.h" -#include "HTBP_Session.h" - -#if !defined (__ACE_INLINE__) -#include "HTBP_Session.inl" -#endif +// SOCK_Stream.cpp +#include "ace/Log_Msg.h" +#include "HTBP_Session.h" +#include "ace/SOCK_Connector.h" +#include "ace/Event_Handler.h" #include "ace/os_include/netinet/os_tcp.h" #include "ace/Auto_Ptr.h" -#include "ace/Event_Handler.h" -#include "ace/Log_Msg.h" -#include "ace/SOCK_Connector.h" #include "HTBP_Filter.h" #include "HTBP_ID_Requestor.h" +#if !defined (__ACE_INLINE__) +#include "HTBP_Session.inl" +#endif + 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 aecdfe22e1e..7098bf0b8fa 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_Traits.h" +#include "ace/Synch.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 f14c8e003f6..77e7a3415b0 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp @@ -9,11 +9,10 @@ //============================================================================= #include "HTBP_Stream.h" -#include "ace/Message_Block.h" -#include "ace/Synch.h" - -#include "HTBP_Filter_Factory.h" #include "HTBP_Session.h" +#include "HTBP_Filter_Factory.h" + +#include "ace/Message_Block.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/protocols/ace/TMCast/LinkListener.hpp b/ACE/protocols/ace/TMCast/LinkListener.hpp index 7e4de5ba688..76944d9d4c9 100644 --- a/ACE/protocols/ace/TMCast/LinkListener.hpp +++ b/ACE/protocols/ace/TMCast/LinkListener.hpp @@ -1,11 +1,12 @@ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> // OS primitives -#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 <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 "Messaging.hpp" #include "Protocol.hpp" @@ -149,7 +150,7 @@ namespace ACE_TMCast private: // FUZZ: disable check_for_ACE_Guard - typedef ACE_Guard<ACE_SYNCH_MUTEX> AutoLock; + typedef ACE_Guard<ACE_Thread_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 f4046f0c68b..883f52273e5 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/Bound_Ptr.h" -#include "ace/Synch_Traits.h" +#include <ace/Synch.h> +#include <ace/Bound_Ptr.h> #include "MTQueue.hpp" @@ -22,7 +22,7 @@ namespace ACE_TMCast MessagePtr; typedef - MTQueue<MessagePtr, ACE_SYNCH_MUTEX, ACE_SYNCH_CONDITION > + MTQueue<MessagePtr, ACE_Thread_Mutex, ACE_Condition<ACE_Thread_Mutex> > MessageQueue; struct MessageQueueAutoLock diff --git a/ACE/protocols/ace/TMCast/TransactionController.hpp b/ACE/protocols/ace/TMCast/TransactionController.hpp index 57c601749ba..43ff7a9ee8c 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_Traits.h" +#include "ace/Synch.h" +#include "ace/Bound_Ptr.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_SYNCH_MUTEX> AutoLock; + typedef ACE_Guard<ACE_Thread_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 d4e8cd6b671..4716ef081c4 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp @@ -2,10 +2,9 @@ * client for a reactor based connection establishment test using HTBP */ -#include "ace/Get_Opt.h" #include "ace/Log_Msg.h" +#include "ace/Get_Opt.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 a24011b9fa4..d2bc3bb661a 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp @@ -2,22 +2,22 @@ * server for a reactor based connection establishment test using HTBP */ -#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" +#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/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/os_include/os_netdb.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 b46468ecb4f..3567e4c897f 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -31,11 +31,10 @@ // This first #undef protects against command-line definitions. #undef ACE_NDEBUG #include "ace/streams.h" - -#include "ace/ACE.h" -#include "ace/Log_Msg.h" #include "ace/Singleton.h" -#include "ace/Synch_Traits.h" +#include "ace/Synch.h" +#include "ace/Log_Msg.h" +#include "ace/ACE.h" // The second #undef protects against being reset in a config.h file. #undef ACE_NDEBUG @@ -304,7 +303,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 1b94d1fe166..cfe26926333 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp +++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp @@ -1,14 +1,13 @@ -#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 d228e1dd3cc..2e43f9bfba4 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp +++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp @@ -1,16 +1,16 @@ -#include "ace/Get_Opt.h" #include "ace/Log_Msg.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/Get_Opt.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 f343a5554d9..23a8d837836 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp +++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp @@ -16,20 +16,20 @@ */ //============================================================================= -#include "ace/Get_Opt.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/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_sys_socket.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 0e4b115faf0..05e2bf4c069 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp +++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp @@ -16,22 +16,22 @@ */ //============================================================================= -#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" -#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 881acf64917..6ae5ff57fd2 100644 --- a/ACE/protocols/tests/HTBP/ping/client.cpp +++ b/ACE/protocols/tests/HTBP/ping/client.cpp @@ -7,7 +7,6 @@ #include "ace/Get_Opt.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 0fb22f90765..e0a52fba7eb 100644 --- a/ACE/protocols/tests/HTBP/ping/server.cpp +++ b/ACE/protocols/tests/HTBP/ping/server.cpp @@ -2,19 +2,19 @@ * server for a basic connection establishment test using HTBP */ -#include "ace/Get_Opt.h" #include "ace/Log_Msg.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 |