From 71285d33e79652a20debdc0bb5e52f0954118d5c Mon Sep 17 00:00:00 2001 From: irfan Date: Sun, 14 Sep 1997 18:04:17 +0000 Subject: *** empty log message *** --- examples/Reactor/Proactor/test_multiple_loops.cpp | 22 +++--- examples/Reactor/Proactor/test_proactor.cpp | 2 +- examples/Reactor/Proactor/test_proactor.mak | 78 +++------------------- examples/Reactor/Proactor/test_proactor.mdp | Bin 54272 -> 54272 bytes 4 files changed, 22 insertions(+), 80 deletions(-) (limited to 'examples/Reactor') diff --git a/examples/Reactor/Proactor/test_multiple_loops.cpp b/examples/Reactor/Proactor/test_multiple_loops.cpp index ae0e898d910..c13ebfce3eb 100644 --- a/examples/Reactor/Proactor/test_multiple_loops.cpp +++ b/examples/Reactor/Proactor/test_multiple_loops.cpp @@ -11,7 +11,7 @@ // = DESCRIPTION // // This example application shows how to write programs that -// combine the Proactor and ReactorEx event loops +// combine the Proactor and Reactor event loops // // = AUTHOR // Irfan Pyarali @@ -41,11 +41,11 @@ public: tv.sec ())); // Since there is only one thread that can do the timeouts in - // ReactorEx, lets keep the handle_timeout short for that + // Reactor, lets keep the handle_timeout short for that // thread. if (ACE_OS::strcmp ((char *) arg, "Proactor") == 0) // Sleep for a while - ACE_OS::sleep (4); + ACE_OS::sleep (1); } virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg) @@ -63,13 +63,15 @@ class Worker : public ACE_Task public: int svc (void) { + ACE_DEBUG ((LM_DEBUG, "(%t) Worker started\n")); + // Handle events for 13 seconds. ACE_Time_Value run_time (13); // Try to become the owner - ACE_ReactorEx::instance ()->owner (ACE_Thread::self ()); + ACE_Reactor::instance ()->owner (ACE_Thread::self ()); - if (ACE_ReactorEx::run_event_loop (run_time) == -1) + if (ACE_Reactor::run_event_loop (run_time) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "Worker::svc"), -1); else ACE_DEBUG ((LM_DEBUG, "(%t) work complete\n")); @@ -84,7 +86,7 @@ main (int, char *[]) Timeout_Handler handler; ACE_Proactor proactor (0, 0, 1); - ACE_ReactorEx::instance ()->register_handler (&proactor); + ACE_Reactor::instance ()->register_handler (&proactor); // Register a 2 second timer. ACE_Time_Value foo_tv (2); @@ -96,10 +98,10 @@ main (int, char *[]) // Register a 3 second timer. ACE_Time_Value bar_tv (3); - if (ACE_ReactorEx::instance ()->schedule_timer (&handler, - (void *) "ReactorEx", - ACE_Time_Value::zero, - bar_tv) == -1) + if (ACE_Reactor::instance ()->schedule_timer (&handler, + (void *) "Reactor", + ACE_Time_Value::zero, + bar_tv) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1); Worker worker; diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp index 6452b39361c..4582fb82888 100644 --- a/examples/Reactor/Proactor/test_proactor.cpp +++ b/examples/Reactor/Proactor/test_proactor.cpp @@ -14,7 +14,7 @@ // operations. // // = AUTHOR -// Irfan Pyarali (irfan@cs.wusl.edu) +// Irfan Pyarali (irfan@cs.wustl.edu) // // ============================================================================ diff --git a/examples/Reactor/Proactor/test_proactor.mak b/examples/Reactor/Proactor/test_proactor.mak index e7914c12643..8bc6cb74f77 100644 --- a/examples/Reactor/Proactor/test_proactor.mak +++ b/examples/Reactor/Proactor/test_proactor.mak @@ -273,17 +273,12 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Get_Opt.i"\ {$(INCLUDE)}"\ace\Handle_Set.h"\ {$(INCLUDE)}"\ace\Handle_Set.i"\ - {$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\ - {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ {$(INCLUDE)}"\ace\High_Res_Timer.h"\ {$(INCLUDE)}"\ace\High_Res_Timer.i"\ {$(INCLUDE)}"\ace\INET_Addr.h"\ {$(INCLUDE)}"\ace\INET_Addr.i"\ - {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ {$(INCLUDE)}"\ace\IPC_SAP.h"\ {$(INCLUDE)}"\ace\IPC_SAP.i"\ - {$(INCLUDE)}"\ace\Local_Tokens.h"\ - {$(INCLUDE)}"\ace\Local_Tokens.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ @@ -293,30 +288,23 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Malloc_T.cpp"\ {$(INCLUDE)}"\ace\Malloc_T.h"\ {$(INCLUDE)}"\ace\Malloc_T.i"\ - {$(INCLUDE)}"\ace\Map_Manager.cpp"\ - {$(INCLUDE)}"\ace\Map_Manager.h"\ - {$(INCLUDE)}"\ace\Map_Manager.i"\ + {$(INCLUDE)}"\ace\Managed_Object.cpp"\ + {$(INCLUDE)}"\ace\Managed_Object.h"\ {$(INCLUDE)}"\ace\Mem_Map.h"\ {$(INCLUDE)}"\ace\Mem_Map.i"\ {$(INCLUDE)}"\ace\Memory_Pool.h"\ {$(INCLUDE)}"\ace\Memory_Pool.i"\ {$(INCLUDE)}"\ace\Message_Block.h"\ {$(INCLUDE)}"\ace\Message_Block.i"\ - {$(INCLUDE)}"\ace\Message_Queue.cpp"\ - {$(INCLUDE)}"\ace\Message_Queue.h"\ - {$(INCLUDE)}"\ace\Message_Queue.i"\ {$(INCLUDE)}"\ace\Object_Manager.h"\ {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ - {$(INCLUDE)}"\ace\Pipe.h"\ - {$(INCLUDE)}"\ace\Pipe.i"\ {$(INCLUDE)}"\ace\Proactor.h"\ {$(INCLUDE)}"\ace\Proactor.i"\ {$(INCLUDE)}"\ace\Reactor.h"\ {$(INCLUDE)}"\ace\Reactor.i"\ - {$(INCLUDE)}"\ace\ReactorEx.h"\ - {$(INCLUDE)}"\ace\ReactorEx.i"\ + {$(INCLUDE)}"\ace\Reactor_Impl.h"\ {$(INCLUDE)}"\ace\Service_Config.h"\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ @@ -338,9 +326,6 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ - {$(INCLUDE)}"\ace\Strategies.h"\ - {$(INCLUDE)}"\ace\Strategies_T.cpp"\ - {$(INCLUDE)}"\ace\Strategies_T.h"\ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\ {$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\ {$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\ @@ -348,7 +333,6 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\ {$(INCLUDE)}"\ace\Synch.h"\ {$(INCLUDE)}"\ace\Synch.i"\ - {$(INCLUDE)}"\ace\Synch_Options.h"\ {$(INCLUDE)}"\ace\Synch_T.cpp"\ {$(INCLUDE)}"\ace\Synch_T.h"\ {$(INCLUDE)}"\ace\Synch_T.i"\ @@ -370,8 +354,6 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Timer_Wheel.h"\ {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ - {$(INCLUDE)}"\ace\Token.h"\ - {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ @@ -393,8 +375,6 @@ DEP_CPP_TEST_T=\ "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ - {$(INCLUDE)}"\ace\Addr.h"\ - {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ {$(INCLUDE)}"\ace\Atomic_Op.i"\ @@ -417,13 +397,7 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ {$(INCLUDE)}"\ace\High_Res_Timer.h"\ {$(INCLUDE)}"\ace\High_Res_Timer.i"\ - {$(INCLUDE)}"\ace\INET_Addr.h"\ - {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ - {$(INCLUDE)}"\ace\IPC_SAP.h"\ - {$(INCLUDE)}"\ace\IPC_SAP.i"\ - {$(INCLUDE)}"\ace\Local_Tokens.h"\ - {$(INCLUDE)}"\ace\Local_Tokens.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ @@ -433,9 +407,8 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Malloc_T.cpp"\ {$(INCLUDE)}"\ace\Malloc_T.h"\ {$(INCLUDE)}"\ace\Malloc_T.i"\ - {$(INCLUDE)}"\ace\Map_Manager.cpp"\ - {$(INCLUDE)}"\ace\Map_Manager.h"\ - {$(INCLUDE)}"\ace\Map_Manager.i"\ + {$(INCLUDE)}"\ace\Managed_Object.cpp"\ + {$(INCLUDE)}"\ace\Managed_Object.h"\ {$(INCLUDE)}"\ace\Mem_Map.h"\ {$(INCLUDE)}"\ace\Mem_Map.i"\ {$(INCLUDE)}"\ace\Memory_Pool.h"\ @@ -452,14 +425,11 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ - {$(INCLUDE)}"\ace\Pipe.h"\ - {$(INCLUDE)}"\ace\Pipe.i"\ {$(INCLUDE)}"\ace\Proactor.h"\ {$(INCLUDE)}"\ace\Proactor.i"\ {$(INCLUDE)}"\ace\Reactor.h"\ {$(INCLUDE)}"\ace\Reactor.i"\ - {$(INCLUDE)}"\ace\ReactorEx.h"\ - {$(INCLUDE)}"\ace\ReactorEx.i"\ + {$(INCLUDE)}"\ace\Reactor_Impl.h"\ {$(INCLUDE)}"\ace\Service_Config.h"\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ @@ -468,12 +438,6 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ {$(INCLUDE)}"\ace\Signal.i"\ - {$(INCLUDE)}"\ace\SOCK.h"\ - {$(INCLUDE)}"\ace\SOCK.i"\ - {$(INCLUDE)}"\ace\SOCK_IO.h"\ - {$(INCLUDE)}"\ace\SOCK_IO.i"\ - {$(INCLUDE)}"\ace\SOCK_Stream.h"\ - {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ @@ -503,7 +467,6 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Thread.i"\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ - {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Heap.h"\ {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ @@ -517,8 +480,6 @@ DEP_CPP_TEST_T=\ {$(INCLUDE)}"\ace\Timer_Wheel.h"\ {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ - {$(INCLUDE)}"\ace\Token.h"\ - {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ @@ -540,8 +501,6 @@ DEP_CPP_TEST_M=\ "..\..\..\ace\config-win32.h"\ {$(INCLUDE)}"\ace\ACE.h"\ {$(INCLUDE)}"\ace\ACE.i"\ - {$(INCLUDE)}"\ace\Addr.h"\ - {$(INCLUDE)}"\ace\Addr.i"\ {$(INCLUDE)}"\ace\Asynch_IO.h"\ {$(INCLUDE)}"\ace\Asynch_IO.i"\ {$(INCLUDE)}"\ace\Atomic_Op.i"\ @@ -564,13 +523,7 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Hash_Map_Manager.h"\ {$(INCLUDE)}"\ace\High_Res_Timer.h"\ {$(INCLUDE)}"\ace\High_Res_Timer.i"\ - {$(INCLUDE)}"\ace\INET_Addr.h"\ - {$(INCLUDE)}"\ace\INET_Addr.i"\ {$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\ - {$(INCLUDE)}"\ace\IPC_SAP.h"\ - {$(INCLUDE)}"\ace\IPC_SAP.i"\ - {$(INCLUDE)}"\ace\Local_Tokens.h"\ - {$(INCLUDE)}"\ace\Local_Tokens.i"\ {$(INCLUDE)}"\ace\Log_Msg.h"\ {$(INCLUDE)}"\ace\Log_Priority.h"\ {$(INCLUDE)}"\ace\Log_Record.h"\ @@ -580,9 +533,8 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Malloc_T.cpp"\ {$(INCLUDE)}"\ace\Malloc_T.h"\ {$(INCLUDE)}"\ace\Malloc_T.i"\ - {$(INCLUDE)}"\ace\Map_Manager.cpp"\ - {$(INCLUDE)}"\ace\Map_Manager.h"\ - {$(INCLUDE)}"\ace\Map_Manager.i"\ + {$(INCLUDE)}"\ace\Managed_Object.cpp"\ + {$(INCLUDE)}"\ace\Managed_Object.h"\ {$(INCLUDE)}"\ace\Mem_Map.h"\ {$(INCLUDE)}"\ace\Mem_Map.i"\ {$(INCLUDE)}"\ace\Memory_Pool.h"\ @@ -599,14 +551,11 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Object_Manager.i"\ {$(INCLUDE)}"\ace\OS.h"\ {$(INCLUDE)}"\ace\OS.i"\ - {$(INCLUDE)}"\ace\Pipe.h"\ - {$(INCLUDE)}"\ace\Pipe.i"\ {$(INCLUDE)}"\ace\Proactor.h"\ {$(INCLUDE)}"\ace\Proactor.i"\ {$(INCLUDE)}"\ace\Reactor.h"\ {$(INCLUDE)}"\ace\Reactor.i"\ - {$(INCLUDE)}"\ace\ReactorEx.h"\ - {$(INCLUDE)}"\ace\ReactorEx.i"\ + {$(INCLUDE)}"\ace\Reactor_Impl.h"\ {$(INCLUDE)}"\ace\Service_Config.h"\ {$(INCLUDE)}"\ace\Service_Config.i"\ {$(INCLUDE)}"\ace\Service_Object.h"\ @@ -615,12 +564,6 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Shared_Object.i"\ {$(INCLUDE)}"\ace\Signal.h"\ {$(INCLUDE)}"\ace\Signal.i"\ - {$(INCLUDE)}"\ace\SOCK.h"\ - {$(INCLUDE)}"\ace\SOCK.i"\ - {$(INCLUDE)}"\ace\SOCK_IO.h"\ - {$(INCLUDE)}"\ace\SOCK_IO.i"\ - {$(INCLUDE)}"\ace\SOCK_Stream.h"\ - {$(INCLUDE)}"\ace\SOCK_Stream.i"\ {$(INCLUDE)}"\ace\SString.h"\ {$(INCLUDE)}"\ace\SString.i"\ {$(INCLUDE)}"\ace\stdcpp.h"\ @@ -650,7 +593,6 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Thread.i"\ {$(INCLUDE)}"\ace\Thread_Manager.h"\ {$(INCLUDE)}"\ace\Thread_Manager.i"\ - {$(INCLUDE)}"\ace\Time_Value.h"\ {$(INCLUDE)}"\ace\Timer_Heap.h"\ {$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Heap_T.h"\ @@ -664,8 +606,6 @@ DEP_CPP_TEST_M=\ {$(INCLUDE)}"\ace\Timer_Wheel.h"\ {$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\ {$(INCLUDE)}"\ace\Timer_Wheel_T.h"\ - {$(INCLUDE)}"\ace\Token.h"\ - {$(INCLUDE)}"\ace\Token.i"\ {$(INCLUDE)}"\ace\Trace.h"\ {$(INCLUDE)}"\ace\ws2tcpip.h"\ diff --git a/examples/Reactor/Proactor/test_proactor.mdp b/examples/Reactor/Proactor/test_proactor.mdp index c2b21260a2f..66e18afbad1 100644 Binary files a/examples/Reactor/Proactor/test_proactor.mdp and b/examples/Reactor/Proactor/test_proactor.mdp differ -- cgit v1.2.1