diff options
28 files changed, 435 insertions, 1407 deletions
diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp index 01b9c2df138..b4758a1ba86 100644 --- a/ace/Select_Reactor.cpp +++ b/ace/Select_Reactor.cpp @@ -1296,26 +1296,26 @@ ACE_Select_Reactor::handler_i (ACE_HANDLE handle, // Must be called with locks held int -ACE_Reactor::resume_i (ACE_HANDLE handle) +ACE_Select_Reactor::resume_i (ACE_HANDLE handle) { - ACE_TRACE ("ACE_Reactor::resume"); + ACE_TRACE ("ACE_Select_Reactor::resume"); if (this->handler_rep_.find (handle) == 0) return -1; if (this->suspend_set_.rd_mask_.is_set (handle)) { this->wait_set_.rd_mask_.set_bit (handle); - this->suspend_set_.rd_mask_.clr_bit(handle); + this->suspend_set_.rd_mask_.clr_bit (handle); } if (this->suspend_set_.wr_mask_.is_set (handle)) { this->wait_set_.wr_mask_.set_bit (handle); - this->suspend_set_.wr_mask_.clr_bit(handle); + this->suspend_set_.wr_mask_.clr_bit (handle); } if (this->suspend_set_.ex_mask_.is_set (handle)) { this->wait_set_.ex_mask_.set_bit (handle); - this->suspend_set_.ex_mask_.clr_bit(handle); + this->suspend_set_.ex_mask_.clr_bit (handle); } return 0; } @@ -1323,26 +1323,26 @@ ACE_Reactor::resume_i (ACE_HANDLE handle) // Must be called with locks held int -ACE_Reactor::suspend_i (ACE_HANDLE handle) +ACE_Select_Reactor::suspend_i (ACE_HANDLE handle) { - ACE_TRACE ("ACE_Reactor::suspend"); + ACE_TRACE ("ACE_Select_Reactor::suspend"); if (this->handler_rep_.find (handle) == 0) return -1; if (this->wait_set_.rd_mask_.is_set (handle)) { this->suspend_set_.rd_mask_.set_bit (handle); - this->wait_set_.wr_mask_.clr_bit(handle); + this->wait_set_.wr_mask_.clr_bit (handle); } if (this->wait_set_.wr_mask_.is_set (handle)) { this->suspend_set_.wr_mask_.set_bit (handle); - this->wait_set_.wr_mask_.clr_bit(handle); + this->wait_set_.wr_mask_.clr_bit (handle); } if (this->wait_set_.ex_mask_.is_set (handle)) { this->suspend_set_.ex_mask_.set_bit (handle); - this->ex_mask_.clr_bit(handle); + this->wait_set_.ex_mask_.clr_bit (handle); } return 0; } diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h index 3df57809e1b..9b3775884ca 100644 --- a/ace/Select_Reactor.h +++ b/ace/Select_Reactor.h @@ -747,7 +747,7 @@ protected: ACE_Select_Reactor_Handle_Set wait_set_; // Tracks handles that are waited for by select(). - ACE_Reactor_Handle_Set suspend_set_; + ACE_Select_Reactor_Handle_Set suspend_set_; // Tracks handles that are currently suspended. ACE_Select_Reactor_Handle_Set ready_set_; diff --git a/ace/ace.mak b/ace/ace.mak index 76089483e36..b5e760aa598 100644 --- a/ace/ace.mak +++ b/ace/ace.mak @@ -5382,6 +5382,8 @@ DEP_CPP_STRAT=\ {$(INCLUDE)}"\.\Service_Config.i"\
{$(INCLUDE)}"\.\Service_Object.h"\
{$(INCLUDE)}"\.\Service_Object.i"\
+ {$(INCLUDE)}"\.\Service_Types.h"\
+ {$(INCLUDE)}"\.\Service_Types.i"\
{$(INCLUDE)}"\.\Shared_Object.h"\
{$(INCLUDE)}"\.\Shared_Object.i"\
{$(INCLUDE)}"\.\Signal.h"\
@@ -7279,13 +7281,10 @@ DEP_CPP_SERVICE_C=\ {$(INCLUDE)}"\.\Get_Opt.i"\
{$(INCLUDE)}"\.\Handle_Set.h"\
{$(INCLUDE)}"\.\Handle_Set.i"\
- {$(INCLUDE)}"\.\Hash_Map_Manager.cpp"\
- {$(INCLUDE)}"\.\Hash_Map_Manager.h"\
{$(INCLUDE)}"\.\High_Res_Timer.h"\
{$(INCLUDE)}"\.\High_Res_Timer.i"\
{$(INCLUDE)}"\.\INET_Addr.h"\
{$(INCLUDE)}"\.\INET_Addr.i"\
- {$(INCLUDE)}"\.\IO_Cntl_Msg.h"\
{$(INCLUDE)}"\.\IPC_SAP.h"\
{$(INCLUDE)}"\.\IPC_SAP.i"\
{$(INCLUDE)}"\.\Log_Msg.h"\
@@ -7303,14 +7302,6 @@ DEP_CPP_SERVICE_C=\ {$(INCLUDE)}"\.\Mem_Map.i"\
{$(INCLUDE)}"\.\Memory_Pool.h"\
{$(INCLUDE)}"\.\Memory_Pool.i"\
- {$(INCLUDE)}"\.\Message_Block.h"\
- {$(INCLUDE)}"\.\Message_Block.i"\
- {$(INCLUDE)}"\.\Message_Queue.cpp"\
- {$(INCLUDE)}"\.\Message_Queue.h"\
- {$(INCLUDE)}"\.\Message_Queue.i"\
- {$(INCLUDE)}"\.\Module.cpp"\
- {$(INCLUDE)}"\.\Module.h"\
- {$(INCLUDE)}"\.\Module.i"\
{$(INCLUDE)}"\.\Object_Manager.h"\
{$(INCLUDE)}"\.\Object_Manager.i"\
{$(INCLUDE)}"\.\Obstack.h"\
@@ -7348,15 +7339,6 @@ DEP_CPP_SERVICE_C=\ {$(INCLUDE)}"\.\SString.h"\
{$(INCLUDE)}"\.\SString.i"\
{$(INCLUDE)}"\.\stdcpp.h"\
- {$(INCLUDE)}"\.\Strategies.h"\
- {$(INCLUDE)}"\.\Strategies_T.cpp"\
- {$(INCLUDE)}"\.\Strategies_T.h"\
- {$(INCLUDE)}"\.\Stream.cpp"\
- {$(INCLUDE)}"\.\Stream.h"\
- {$(INCLUDE)}"\.\Stream.i"\
- {$(INCLUDE)}"\.\Stream_Modules.cpp"\
- {$(INCLUDE)}"\.\Stream_Modules.h"\
- {$(INCLUDE)}"\.\Stream_Modules.i"\
{$(INCLUDE)}"\.\SV_Semaphore_Complex.h"\
{$(INCLUDE)}"\.\SV_Semaphore_Complex.i"\
{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\
@@ -7365,15 +7347,9 @@ DEP_CPP_SERVICE_C=\ {$(INCLUDE)}"\.\Svc_Conf_Tokens.h"\
{$(INCLUDE)}"\.\Synch.h"\
{$(INCLUDE)}"\.\Synch.i"\
- {$(INCLUDE)}"\.\Synch_Options.h"\
{$(INCLUDE)}"\.\Synch_T.cpp"\
{$(INCLUDE)}"\.\Synch_T.h"\
{$(INCLUDE)}"\.\Synch_T.i"\
- {$(INCLUDE)}"\.\Task.h"\
- {$(INCLUDE)}"\.\Task.i"\
- {$(INCLUDE)}"\.\Task_T.cpp"\
- {$(INCLUDE)}"\.\Task_T.h"\
- {$(INCLUDE)}"\.\Task_T.i"\
{$(INCLUDE)}"\.\Thread.h"\
{$(INCLUDE)}"\.\Thread.i"\
{$(INCLUDE)}"\.\Thread_Manager.h"\
@@ -17279,6 +17255,8 @@ DEP_CPP_STRAT=\ {$(INCLUDE)}"\.\Service_Config.i"\
{$(INCLUDE)}"\.\Service_Object.h"\
{$(INCLUDE)}"\.\Service_Object.i"\
+ {$(INCLUDE)}"\.\Service_Types.h"\
+ {$(INCLUDE)}"\.\Service_Types.i"\
{$(INCLUDE)}"\.\Shared_Object.h"\
{$(INCLUDE)}"\.\Shared_Object.i"\
{$(INCLUDE)}"\.\Signal.h"\
@@ -19176,13 +19154,10 @@ DEP_CPP_SERVICE_C=\ {$(INCLUDE)}"\.\Get_Opt.i"\
{$(INCLUDE)}"\.\Handle_Set.h"\
{$(INCLUDE)}"\.\Handle_Set.i"\
- {$(INCLUDE)}"\.\Hash_Map_Manager.cpp"\
- {$(INCLUDE)}"\.\Hash_Map_Manager.h"\
{$(INCLUDE)}"\.\High_Res_Timer.h"\
{$(INCLUDE)}"\.\High_Res_Timer.i"\
{$(INCLUDE)}"\.\INET_Addr.h"\
{$(INCLUDE)}"\.\INET_Addr.i"\
- {$(INCLUDE)}"\.\IO_Cntl_Msg.h"\
{$(INCLUDE)}"\.\IPC_SAP.h"\
{$(INCLUDE)}"\.\IPC_SAP.i"\
{$(INCLUDE)}"\.\Log_Msg.h"\
@@ -19200,14 +19175,6 @@ DEP_CPP_SERVICE_C=\ {$(INCLUDE)}"\.\Mem_Map.i"\
{$(INCLUDE)}"\.\Memory_Pool.h"\
{$(INCLUDE)}"\.\Memory_Pool.i"\
- {$(INCLUDE)}"\.\Message_Block.h"\
- {$(INCLUDE)}"\.\Message_Block.i"\
- {$(INCLUDE)}"\.\Message_Queue.cpp"\
- {$(INCLUDE)}"\.\Message_Queue.h"\
- {$(INCLUDE)}"\.\Message_Queue.i"\
- {$(INCLUDE)}"\.\Module.cpp"\
- {$(INCLUDE)}"\.\Module.h"\
- {$(INCLUDE)}"\.\Module.i"\
{$(INCLUDE)}"\.\Object_Manager.h"\
{$(INCLUDE)}"\.\Object_Manager.i"\
{$(INCLUDE)}"\.\Obstack.h"\
@@ -19245,15 +19212,6 @@ DEP_CPP_SERVICE_C=\ {$(INCLUDE)}"\.\SString.h"\
{$(INCLUDE)}"\.\SString.i"\
{$(INCLUDE)}"\.\stdcpp.h"\
- {$(INCLUDE)}"\.\Strategies.h"\
- {$(INCLUDE)}"\.\Strategies_T.cpp"\
- {$(INCLUDE)}"\.\Strategies_T.h"\
- {$(INCLUDE)}"\.\Stream.cpp"\
- {$(INCLUDE)}"\.\Stream.h"\
- {$(INCLUDE)}"\.\Stream.i"\
- {$(INCLUDE)}"\.\Stream_Modules.cpp"\
- {$(INCLUDE)}"\.\Stream_Modules.h"\
- {$(INCLUDE)}"\.\Stream_Modules.i"\
{$(INCLUDE)}"\.\SV_Semaphore_Complex.h"\
{$(INCLUDE)}"\.\SV_Semaphore_Complex.i"\
{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\
@@ -19262,15 +19220,9 @@ DEP_CPP_SERVICE_C=\ {$(INCLUDE)}"\.\Svc_Conf_Tokens.h"\
{$(INCLUDE)}"\.\Synch.h"\
{$(INCLUDE)}"\.\Synch.i"\
- {$(INCLUDE)}"\.\Synch_Options.h"\
{$(INCLUDE)}"\.\Synch_T.cpp"\
{$(INCLUDE)}"\.\Synch_T.h"\
{$(INCLUDE)}"\.\Synch_T.i"\
- {$(INCLUDE)}"\.\Task.h"\
- {$(INCLUDE)}"\.\Task.i"\
- {$(INCLUDE)}"\.\Task_T.cpp"\
- {$(INCLUDE)}"\.\Task_T.h"\
- {$(INCLUDE)}"\.\Task_T.i"\
{$(INCLUDE)}"\.\Thread.h"\
{$(INCLUDE)}"\.\Thread.i"\
{$(INCLUDE)}"\.\Thread_Manager.h"\
diff --git a/ace/ace.mdp b/ace/ace.mdp Binary files differindex e240468de80..aabedfc5097 100644 --- a/ace/ace.mdp +++ b/ace/ace.mdp diff --git a/examples/Reactor/ReactorEx/reactorex.mak b/examples/Reactor/ReactorEx/reactorex.mak index 23571beafe1..f8425100d05 100644 --- a/examples/Reactor/ReactorEx/reactorex.mak +++ b/examples/Reactor/ReactorEx/reactorex.mak @@ -52,7 +52,7 @@ NULL=nul !ENDIF
################################################################################
# Begin Project
-# PROP Target_Last_Scanned "Timeouts - Win32 Debug"
+# PROP Target_Last_Scanned "Registry_Changes - Win32 Debug"
RSC=rc.exe
CPP=cl.exe
@@ -89,8 +89,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Exceptions.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -150,8 +148,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Multithreading.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -211,8 +207,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Network_Events.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -272,8 +266,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Registration.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -333,8 +325,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Removals.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -394,8 +384,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Talker.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -454,8 +442,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Timeouts.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -515,8 +501,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Directory_Changes.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -558,15 +542,15 @@ LINK32_OBJS= \ OUTDIR=.\.
INTDIR=.\Debug
-ALL : "$(OUTDIR)\console_input.exe"
+ALL : "$(OUTDIR)\Console_Input.exe"
CLEAN :
-@erase "$(INTDIR)\test_console_input.obj"
-@erase "$(INTDIR)\vc40.idb"
-@erase "$(INTDIR)\vc40.pdb"
- -@erase "$(OUTDIR)\console_input.exe"
- -@erase "$(OUTDIR)\console_input.ilk"
- -@erase "$(OUTDIR)\console_input.pdb"
+ -@erase "$(OUTDIR)\Console_Input.exe"
+ -@erase "$(OUTDIR)\Console_Input.ilk"
+ -@erase "$(OUTDIR)\Console_Input.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -576,8 +560,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Console_Input.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -599,7 +581,7 @@ LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ LINK32_OBJS= \
"$(INTDIR)\test_console_input.obj"
-"$(OUTDIR)\console_input.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\Console_Input.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -637,8 +619,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Registry_Changes.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -667,6 +647,9 @@ LINK32_OBJS= \ !ENDIF
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
+ /Fp"$(INTDIR)/Exceptions.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
+
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
@@ -696,10 +679,6 @@ SOURCE=.\test_exceptions.cpp DEP_CPP_TEST_=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -719,15 +698,7 @@ DEP_CPP_TEST_=\ {$(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"\
@@ -737,9 +708,8 @@ 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"\
@@ -753,14 +723,9 @@ DEP_CPP_TEST_=\ {$(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"\
@@ -769,12 +734,6 @@ DEP_CPP_TEST_=\ {$(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"\
@@ -794,25 +753,13 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Synch_T.i"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -832,10 +779,6 @@ SOURCE=.\test_multithreading.cpp DEP_CPP_TEST_M=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -857,15 +800,7 @@ DEP_CPP_TEST_M=\ {$(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"\
@@ -875,9 +810,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"\
@@ -894,14 +828,9 @@ 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"\
@@ -910,12 +839,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"\
@@ -945,23 +868,13 @@ 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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -983,8 +896,6 @@ DEP_CPP_TEST_N=\ {$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1002,17 +913,10 @@ DEP_CPP_TEST_N=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1022,36 +926,19 @@ DEP_CPP_TEST_N=\ {$(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\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(INCLUDE)}"\ace\Shared_Object.i"\
+ {$(INCLUDE)}"\ace\Reactor_Impl.h"\
{$(INCLUDE)}"\ace\Signal.h"\
{$(INCLUDE)}"\ace\Signal.i"\
{$(INCLUDE)}"\ace\SOCK.h"\
@@ -1065,40 +952,22 @@ DEP_CPP_TEST_N=\ {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1119,10 +988,6 @@ SOURCE=.\test_registration.cpp DEP_CPP_TEST_R=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1140,17 +1005,6 @@ DEP_CPP_TEST_R=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1160,81 +1014,39 @@ DEP_CPP_TEST_R=\ {$(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\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(INCLUDE)}"\ace\Shared_Object.i"\
+ {$(INCLUDE)}"\ace\Reactor_Impl.h"\
{$(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"\
- {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1255,10 +1067,6 @@ SOURCE=.\test_removals.cpp DEP_CPP_TEST_RE=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1276,17 +1084,6 @@ DEP_CPP_TEST_RE=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1296,30 +1093,19 @@ DEP_CPP_TEST_RE=\ {$(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"\
@@ -1328,18 +1114,9 @@ DEP_CPP_TEST_RE=\ {$(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"\
- {$(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"\
@@ -1347,30 +1124,15 @@ DEP_CPP_TEST_RE=\ {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1423,8 +1185,6 @@ DEP_CPP_TEST_T=\ {$(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"\
@@ -1434,9 +1194,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"\
@@ -1453,14 +1212,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"\
@@ -1522,8 +1278,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"\
@@ -1544,10 +1298,6 @@ SOURCE=.\test_timeouts.cpp DEP_CPP_TEST_TI=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1565,17 +1315,6 @@ DEP_CPP_TEST_TI=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1585,30 +1324,19 @@ DEP_CPP_TEST_TI=\ {$(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"\
@@ -1617,18 +1345,9 @@ DEP_CPP_TEST_TI=\ {$(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"\
- {$(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"\
@@ -1636,30 +1355,15 @@ DEP_CPP_TEST_TI=\ {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1680,10 +1384,6 @@ SOURCE=.\test_directory_changes.cpp DEP_CPP_TEST_D=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1701,17 +1401,6 @@ DEP_CPP_TEST_D=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1721,81 +1410,39 @@ DEP_CPP_TEST_D=\ {$(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\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(INCLUDE)}"\ace\Shared_Object.i"\
+ {$(INCLUDE)}"\ace\Reactor_Impl.h"\
{$(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"\
- {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1817,10 +1464,6 @@ SOURCE=.\test_console_input.cpp DEP_CPP_TEST_C=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1838,17 +1481,6 @@ DEP_CPP_TEST_C=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1858,81 +1490,39 @@ DEP_CPP_TEST_C=\ {$(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\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(INCLUDE)}"\ace\Shared_Object.i"\
+ {$(INCLUDE)}"\ace\Reactor_Impl.h"\
{$(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"\
- {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1953,10 +1543,6 @@ SOURCE=.\test_registry_changes.cpp DEP_CPP_TEST_REG=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1974,17 +1560,6 @@ DEP_CPP_TEST_REG=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1994,82 +1569,40 @@ DEP_CPP_TEST_REG=\ {$(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\Registry.h"\
- {$(INCLUDE)}"\ace\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(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"\
- {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
{$(INCLUDE)}"\algobase.h"\
diff --git a/examples/Reactor/ReactorEx/reactorex.mdp b/examples/Reactor/ReactorEx/reactorex.mdp Binary files differindex 00f3e30ecb4..cf058b17b54 100644 --- a/examples/Reactor/ReactorEx/reactorex.mdp +++ b/examples/Reactor/ReactorEx/reactorex.mdp diff --git a/examples/Reactor/ReactorEx/test_console_input.cpp b/examples/Reactor/ReactorEx/test_console_input.cpp index 8da38cc3037..f76f678d9df 100644 --- a/examples/Reactor/ReactorEx/test_console_input.cpp +++ b/examples/Reactor/ReactorEx/test_console_input.cpp @@ -10,32 +10,32 @@ // // = DESCRIPTION // -// This application tests the working of ReactorEx when users are -// interested in console input. +// This application tests the working of WFMO_Reactor when users +// are interested in console input. // // = AUTHOR // Irfan Pyarali // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_ReactorEx &reactorEx); + Event_Handler (ACE_Reactor &reactor); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); }; -Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) +Event_Handler::Event_Handler (ACE_Reactor &reactor) { - this->reactorEx (&reactorEx); + this->reactor (&reactor); - if (this->reactorEx ()->register_handler (this, - ACE_STDIN) != 0) - ACE_ERROR ((LM_ERROR, "Registration with ReactorEx could not be done\n")); + if (this->reactor ()->register_handler (this, + ACE_STDIN) != 0) + ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } int @@ -47,12 +47,12 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) if (result <= 0) { - this->reactorEx ()->close (); + this->reactor ()->close (); ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::read"), -1); } if (ACE_OS::strcmp (__TEXT("quit\r\n"), buffer) == 0) - this->reactorEx ()->close (); + this->reactor ()->close (); ACE_DEBUG ((LM_DEBUG, "User input: %s", buffer)); @@ -63,19 +63,19 @@ int Event_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) { - ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from ReactorEx\n")); + ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n")); return 0; } int main (int, char *[]) { - ACE_ReactorEx reactorEx; - Event_Handler handler (reactorEx); + ACE_Reactor reactor; + Event_Handler handler (reactor); int result = 0; while (result != -1) - result = reactorEx.handle_events (); + result = reactor.handle_events (); return 0; } diff --git a/examples/Reactor/ReactorEx/test_directory_changes.cpp b/examples/Reactor/ReactorEx/test_directory_changes.cpp index 0761baa61d8..37a66afa5c6 100644 --- a/examples/Reactor/ReactorEx/test_directory_changes.cpp +++ b/examples/Reactor/ReactorEx/test_directory_changes.cpp @@ -10,15 +10,15 @@ // // = DESCRIPTION // -// This application tests the working of ReactorEx when users are -// interested in monitoring changes in the filesystem. +// This application tests the working of WFMO_Reactor when users +// are interested in monitoring changes in the filesystem. // // = AUTHOR // Irfan Pyarali // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" static int stop_test = 0; static LPCTSTR directory = __TEXT ("."); @@ -27,7 +27,7 @@ static LPCTSTR temp_file = __TEXT ("foo"); class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_ReactorEx &reactorEx); + Event_Handler (ACE_Reactor &reactor); ~Event_Handler (void); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, @@ -37,10 +37,10 @@ private: ACE_HANDLE handle_; }; -Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) +Event_Handler::Event_Handler (ACE_Reactor &reactor) : handle_ (ACE_INVALID_HANDLE) { - this->reactorEx (&reactorEx); + this->reactor (&reactor); int change_notification_flags = FILE_NOTIFY_CHANGE_FILE_NAME; @@ -51,9 +51,9 @@ Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) if (this->handle_ == ACE_INVALID_HANDLE) ACE_ERROR ((LM_ERROR, "FindFirstChangeNotification could not be setup\n")); - if (this->reactorEx ()->register_handler (this, - this->handle_) != 0) - ACE_ERROR ((LM_ERROR, "Registration with ReactorEx could not be done\n")); + if (this->reactor ()->register_handler (this, + this->handle_) != 0) + ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } Event_Handler::~Event_Handler (void) @@ -66,7 +66,7 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) ACE_DEBUG ((LM_DEBUG, "(%t) Something changed in this directory\n")); ::FindNextChangeNotification (this->handle_); if (stop_test) - this->reactorEx ()->close (); + this->reactor ()->close (); return 0; } @@ -74,7 +74,7 @@ int Event_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) { - ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from ReactorEx\n")); + ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n")); ::FindCloseChangeNotification (this->handle_); return 0; } @@ -101,14 +101,14 @@ worker (void) int main (int, char *[]) { - ACE_ReactorEx reactorEx; - Event_Handler handler (reactorEx); + ACE_Reactor reactor; + Event_Handler handler (reactor); ACE_ASSERT (ACE_OS::thr_create ((ACE_THR_FUNC) worker, 0, 0, 0) == 0); int result = 0; while (result != -1) - result = reactorEx.handle_events (); + result = reactor.handle_events (); return 0; } diff --git a/examples/Reactor/ReactorEx/test_exceptions.cpp b/examples/Reactor/ReactorEx/test_exceptions.cpp index 7a975ec1d12..1c7ca508978 100644 --- a/examples/Reactor/ReactorEx/test_exceptions.cpp +++ b/examples/Reactor/ReactorEx/test_exceptions.cpp @@ -10,11 +10,11 @@ // // = DESCRIPTION // -// This test application tests the state of ReactorEx when +// This test application tests the state of WFMO_Reactor when // exceptions occurs when executing user callbacks. // -// The thread count in ReactorEx is used to ensure that state of -// ReactorEx is not fouled up when exceptions occur in user code. +// The thread count in WFMO_Reactor is used to ensure that state of +// WFMO_Reactor is not fouled up when exceptions occur in user code. // This example also shows how to write event loops that survive // user exceptions // @@ -23,7 +23,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/WFMO_Reactor.h" class Event_Handler : public ACE_Event_Handler { @@ -51,25 +51,25 @@ private: ACE_Manual_Event event_; }; -class ACE_ReactorEx_Test +class ACE_WFMO_Reactor_Test { public: - static void doit () + static void doit (ACE_WFMO_Reactor &wfmo_reactor) { for (int i = 1; i <= 10; i++) { - ACE_DEBUG ((LM_DEBUG, "Active threads in ReactorEx (before handle_events) = %d\n", - ACE_ReactorEx::instance ()->active_threads_)); + ACE_DEBUG ((LM_DEBUG, "Active threads in WFMO_Reactor (before handle_events) = %d\n", + wfmo_reactor.active_threads_)); ACE_SEH_TRY { - ACE_ReactorEx::instance ()->handle_events (); + wfmo_reactor.handle_events (); } ACE_SEH_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { ACE_DEBUG ((LM_DEBUG, "Exception occurred\n")); } - ACE_DEBUG ((LM_DEBUG, "Active threads in ReactorEx (after handle_events) = %d\n", - ACE_ReactorEx::instance ()->active_threads_)); + ACE_DEBUG ((LM_DEBUG, "Active threads in WFMO_Reactor (after handle_events) = %d\n", + wfmo_reactor.active_threads_)); } } }; @@ -78,8 +78,9 @@ int main (int, char *[]) { Event_Handler handler; - ACE_ReactorEx::instance ()->register_handler (&handler); - ACE_ReactorEx_Test::doit (); + ACE_WFMO_Reactor wfmo_reactor; + wfmo_reactor.register_handler (&handler); + ACE_WFMO_Reactor_Test::doit (wfmo_reactor); return 0; } diff --git a/examples/Reactor/ReactorEx/test_multithreading.cpp b/examples/Reactor/ReactorEx/test_multithreading.cpp index 01fccc19350..62eaa01212e 100644 --- a/examples/Reactor/ReactorEx/test_multithreading.cpp +++ b/examples/Reactor/ReactorEx/test_multithreading.cpp @@ -9,10 +9,13 @@ // test_multithreading.cpp // // = DESCRIPTION +// // This application tests multiple threads simultaneously calling -// ReactorEx->handle_events(). It also shows how different threads -// can update the state of ReactorEx by registering and removing -// Event_Handlers. +// Reactor::handle_events(). It also shows how different threads +// can update the state of Reactor by registering and removing +// Event_Handlers. +// +// Note that this test will only work with WFMO_Reactor // // = AUTHOR // Irfan Pyarali @@ -20,11 +23,12 @@ // ============================================================================ #include "ace/Task.h" -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" +#include "ace/WFMO_Reactor.h" #include "ace/Get_Opt.h" static int concurrent_threads = 1; -static int number_of_handles = ACE_ReactorEx::DEFAULT_SIZE; +static int number_of_handles = ACE_Reactor::instance ()->size (); static int number_of_handles_to_signal = 1; static int interval = 2; static int iterations = 10; @@ -105,14 +109,14 @@ private: ACE_Auto_Event *events_; }; -// All threads do reactorEx->handle_events () +// All threads do reactor->handle_events () int Task_Handler::svc (void) { // Try to become the owner - ACE_ReactorEx::instance ()->owner (ACE_Thread::self ()); + ACE_Reactor::instance ()->owner (ACE_Thread::self ()); // Run the event loop. - return ACE_ReactorEx::run_event_loop (); + return ACE_Reactor::run_event_loop (); } Task_Handler::Task_Handler (size_t number_of_handles, @@ -122,9 +126,9 @@ Task_Handler::Task_Handler (size_t number_of_handles, for (size_t i = 0; i < number_of_handles; i++) { - if (ACE_ReactorEx::instance ()->register_handler (this, - this->events_[i].handle ()) == -1) - ACE_ERROR ((LM_ERROR, "%p\t cannot register handle %d with ReactorEx\n", + if (ACE_Reactor::instance ()->register_handler (this, + this->events_[i].handle ()) == -1) + ACE_ERROR ((LM_ERROR, "%p\t cannot register handle %d with Reactor\n", "Task_Handler::Task_Handler", i)); } // Make us an active object. @@ -144,21 +148,21 @@ int Task_Handler::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *) { // When signaled, print message, remove self, and add self - // This will force ReactorEx to update its internal handle tables + // This will force Reactor to update its internal handle tables ACE_DEBUG ((LM_DEBUG, "(%t) handle_signal() called: handle value = %d\n", siginfo->si_handle_)); - if (ACE_ReactorEx::instance ()->remove_handler (siginfo->si_handle_, - ACE_Event_Handler::DONT_CALL) == -1) + if (ACE_Reactor::instance ()->remove_handler (siginfo->si_handle_, + ACE_Event_Handler::DONT_CALL) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\tTask cannot be unregistered from ReactorEx: handle value = %d\n", + "(%t) %p\tTask cannot be unregistered from Reactor: handle value = %d\n", "Task_Handler::handle_signal", siginfo->si_handle_), -1); - if (ACE_ReactorEx::instance ()->register_handler (this, - siginfo->si_handle_) == -1) + if (ACE_Reactor::instance ()->register_handler (this, + siginfo->si_handle_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\tTask cannot be registered with ReactorEx: handle value = %d\n", + "(%t) %p\tTask cannot be registered with Reactor: handle value = %d\n", "Task_Handler::handle_signal", siginfo->si_handle_), -1); return 0; @@ -210,9 +214,9 @@ main (int argc, char **argv) ACE_DEBUG ((LM_DEBUG, "********************************************************\n")); // Setup a timer for the task - if (ACE_ReactorEx::instance ()->schedule_timer (&task, - (void *) i, - 0) == -1) + if (ACE_Reactor::instance ()->schedule_timer (&task, + (void *) i, + 0) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1); for (int i = 0; i < number_of_handles_to_signal; i++) @@ -223,8 +227,8 @@ main (int argc, char **argv) // Sleep for a while ACE_OS::sleep (interval); - // Close ReactorEx - ACE_ReactorEx::instance ()->close (); + // Close Reactor + ACE_Reactor::instance ()->close (); // Wait for all threads to exit ACE_Thread_Manager::instance ()->wait (); diff --git a/examples/Reactor/ReactorEx/test_network_events.cpp b/examples/Reactor/ReactorEx/test_network_events.cpp index 5ab83cb2d23..a954f626e5e 100644 --- a/examples/Reactor/ReactorEx/test_network_events.cpp +++ b/examples/Reactor/ReactorEx/test_network_events.cpp @@ -10,7 +10,7 @@ // // = DESCRIPTION // -// This application tests ReactorEx to make sure that it responds +// This application tests Reactor to make sure that it responds // correctly to different kinds of network events. // // The test starts off by creating a Network_Listener, that listens @@ -31,14 +31,14 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Stream.h" #include "ace/SOCK_Acceptor.h" // Globals for this test int stop_test = 0; -ACE_ReactorEx reactorEx; +ACE_Reactor reactor; class Network_Handler : public ACE_Event_Handler { @@ -58,11 +58,11 @@ public: Network_Handler::Network_Handler (ACE_SOCK_Stream &s) : stream_ (s) { - this->reactorEx (&::reactorEx); + this->reactor (&::reactor); ACE_Reactor_Mask mask = ACE_Event_Handler::READ_MASK | ACE_Event_Handler::CLOSE_MASK; - ACE_ASSERT (this->reactorEx ()->register_handler (this, - mask) == 0); + ACE_ASSERT (this->reactor ()->register_handler (this, + mask) == 0); } ACE_HANDLE @@ -101,7 +101,7 @@ Network_Handler::handle_close (ACE_HANDLE handle, if (close_mask == ACE_Event_Handler::CLOSE_MASK) { ACE_Reactor_Mask mask = ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::ALL_EVENTS_MASK; - this->reactorEx ()->remove_handler (this, mask); + this->reactor ()->remove_handler (this, mask); } this->stream_.close (); @@ -130,9 +130,9 @@ Network_Listener::Network_Listener (void) : local_address_ (ACE_DEFAULT_SERVER_PORT), acceptor_ (local_address_, 1) { - this->reactorEx (&::reactorEx); - ACE_ASSERT (this->reactorEx ()->register_handler (this, - ACE_Event_Handler::ACCEPT_MASK) == 0); + this->reactor (&::reactor); + ACE_ASSERT (this->reactor ()->register_handler (this, + ACE_Event_Handler::ACCEPT_MASK) == 0); } ACE_HANDLE @@ -177,7 +177,7 @@ main (int, char *[]) int result = 0; while (!stop_test && result != -1) { - result = reactorEx.handle_events (); + result = reactor.handle_events (); } return 0; }; diff --git a/examples/Reactor/ReactorEx/test_registration.cpp b/examples/Reactor/ReactorEx/test_registration.cpp index 24fd6a0cedb..82456387966 100644 --- a/examples/Reactor/ReactorEx/test_registration.cpp +++ b/examples/Reactor/ReactorEx/test_registration.cpp @@ -11,18 +11,18 @@ // = DESCRIPTION // // This test application tests a wide range of registration, -// suspension, resumption, and removal of events from ReactorEx. +// suspension, resumption, and removal of events from Reactor. // -// The application initially registers two events with ReactorEx. A +// The application initially registers two events with Reactor. A // auxiliary thread is created to do the signaling on the // events. When the first event is signaled, the event is suspended -// from ReactorEx. The event is then signaled again, but is "lost" +// from Reactor. The event is then signaled again, but is "lost" // since the handler has been suspended. When the second event is // signal, the first event is resumed and the second is // suspended. When the first event is signaled again, both events -// are removed from ReactorEx. +// are removed from Reactor. // -// This test shows off the following features of ReactorEx: +// This test shows off the following features of Reactor: // - Registration // - Suspension // - Resumption @@ -33,11 +33,11 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" // Globals for this test int stop_test = 0; -ACE_ReactorEx reactorEx; +ACE_Reactor reactor; class Simple_Handler : public ACE_Event_Handler @@ -72,21 +72,21 @@ Simple_Handler::handle_signal (int signum, siginfo_t *s, ucontext_t *) if (this->handle_signal_count_ == 1) { ACE_DEBUG ((LM_DEBUG, "suspending handle = %d\n", event1_.handle ())); - this->reactorEx ()->suspend_handler (event1_.handle ()); + this->reactor ()->suspend_handler (event1_.handle ()); } else if (this->handle_signal_count_ == 2) { ACE_DEBUG ((LM_DEBUG, "resuming handle = %d\n", event1_.handle ())); - this->reactorEx ()->resume_handler (event1_.handle ()); + this->reactor ()->resume_handler (event1_.handle ()); ACE_DEBUG ((LM_DEBUG, "suspending handle = %d\n", event2_.handle ())); - this->reactorEx ()->suspend_handler (event2_.handle ()); + this->reactor ()->suspend_handler (event2_.handle ()); } else if (this->handle_signal_count_ == 3) { ACE_DEBUG ((LM_DEBUG, "removing handle = %d\n", event1_.handle ())); - this->reactorEx ()->remove_handler (event1_.handle ()); + this->reactor ()->remove_handler (event1_.handle (), ACE_Event_Handler::NULL_MASK); ACE_DEBUG ((LM_DEBUG, "removing handle = %d\n", event2_.handle ())); - this->reactorEx ()->remove_handler (event2_.handle ()); + this->reactor ()->remove_handler (event2_.handle (), ACE_Event_Handler::NULL_MASK); } return 0; } @@ -138,17 +138,17 @@ worker (void) int main (int, char *[]) { - ACE_ASSERT (reactorEx.register_handler (&simple_handler, - simple_handler.event1_.handle ()) == 0); - ACE_ASSERT (reactorEx.register_handler (&simple_handler, - simple_handler.event2_.handle ()) == 0); + ACE_ASSERT (reactor.register_handler (&simple_handler, + simple_handler.event1_.handle ()) == 0); + ACE_ASSERT (reactor.register_handler (&simple_handler, + simple_handler.event2_.handle ()) == 0); ACE_ASSERT (ACE_OS::thr_create ((ACE_THR_FUNC) worker, 0, 0, 0) == 0); int result = 0; while (!stop_test && result != -1) { - result = reactorEx.handle_events (); + result = reactor.handle_events (); } return 0; }; diff --git a/examples/Reactor/ReactorEx/test_registry_changes.cpp b/examples/Reactor/ReactorEx/test_registry_changes.cpp index 3f42bd6a831..b4ae55edab9 100644 --- a/examples/Reactor/ReactorEx/test_registry_changes.cpp +++ b/examples/Reactor/ReactorEx/test_registry_changes.cpp @@ -10,7 +10,7 @@ // // = DESCRIPTION // -// This application tests the working of ReactorEx when users are +// This application tests the working of Reactor when users are // interested in monitoring changes in the registry. // // = AUTHOR @@ -18,7 +18,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/Registry.h" static int stop_test = 0; @@ -28,7 +28,7 @@ static LPCTSTR temp_context_name = __TEXT ("ACE temporary context"); class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_ReactorEx &reactorEx); + Event_Handler (ACE_Reactor &reactor); ~Event_Handler (void); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, @@ -40,10 +40,10 @@ private: ACE_Registry::Naming_Context context_; }; -Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) +Event_Handler::Event_Handler (ACE_Reactor &reactor) : context_ (context_to_monitor) { - this->reactorEx (&reactorEx); + this->reactor (&reactor); if (::RegNotifyChangeKeyValue (this->context_.key (), // handle of key to watch FALSE, // flag for subkey notification @@ -53,9 +53,9 @@ Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) ) != ERROR_SUCCESS) ACE_ERROR ((LM_ERROR, "RegNotifyChangeKeyValue could not be setup\n")); - if (this->reactorEx ()->register_handler (this, - this->event_.handle ()) != 0) - ACE_ERROR ((LM_ERROR, "Registration with ReactorEx could not be done\n")); + if (this->reactor ()->register_handler (this, + this->event_.handle ()) != 0) + ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } Event_Handler::~Event_Handler (void) @@ -68,7 +68,7 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) ACE_DEBUG ((LM_DEBUG, "(%t) Something changed in the Registry\n")); if (stop_test) - this->reactorEx ()->close (); + this->reactor ()->close (); else if (::RegNotifyChangeKeyValue (this->context_.key (), // handle of key to watch FALSE, // flag for subkey notification REG_NOTIFY_CHANGE_NAME, // changes to be reported @@ -84,7 +84,7 @@ int Event_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) { - ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from ReactorEx\n")); + ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n")); return 0; } @@ -120,14 +120,14 @@ worker (Event_Handler *event_handler) int main (int, char *[]) { - ACE_ReactorEx reactorEx; - Event_Handler handler (reactorEx); + ACE_Reactor reactor; + Event_Handler handler (reactor); ACE_ASSERT (ACE_OS::thr_create ((ACE_THR_FUNC) worker, &handler, 0, 0) == 0); int result = 0; while (result != -1) - result = reactorEx.handle_events (); + result = reactor.handle_events (); return 0; } diff --git a/examples/Reactor/ReactorEx/test_removals.cpp b/examples/Reactor/ReactorEx/test_removals.cpp index fda33df704a..3f24213e561 100644 --- a/examples/Reactor/ReactorEx/test_removals.cpp +++ b/examples/Reactor/ReactorEx/test_removals.cpp @@ -10,9 +10,9 @@ // // = DESCRIPTION // -// Tests the ReactorEx's ability to handle simultaneous events. If +// Tests the Reactor's ability to handle simultaneous events. If // you pass anything on the command-line, then each handler -// requests to be removed from the ReactorEx after each event. +// requests to be removed from the Reactor after each event. // // = AUTHOR // Tim Harrison @@ -20,7 +20,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/Service_Config.h" #include "ace/Synch.h" @@ -30,7 +30,7 @@ class Event_Handler : public ACE_Event_Handler // // = DESCRIPTION // -// Creates event. Registers with ReactorEx. Signals event. If +// Creates event. Registers with Reactor. Signals event. If // created with -close_down- it returns -1 from handle signal. { public: @@ -39,9 +39,9 @@ public: : event_number_ (event_number), close_down_ (close_down) { - if (ACE_ReactorEx::instance ()->register_handler (this, - this->event_.handle ()) == -1) - ACE_ERROR ((LM_ERROR, "%p\tevent handler %d cannot be added to ReactorEx\n", "", event_number_)); + if (ACE_Reactor::instance ()->register_handler (this, + this->event_.handle ()) == -1) + ACE_ERROR ((LM_ERROR, "%p\tevent handler %d cannot be added to Reactor\n", "", event_number_)); this->event_.signal (); } @@ -83,14 +83,14 @@ main (int argc, char *argv[]) { int close_down = argc > 1 ? 1 : 0; - for (int i = 1; i <= ACE_ReactorEx::DEFAULT_SIZE; i++) + for (int i = 1; i <= ACE_Reactor::instance ()->size (); i++) new Event_Handler (i, close_down); int result = 0; ACE_Time_Value time (1); while (1) { - result = ACE_ReactorEx::instance ()->handle_events (time); + result = ACE_Reactor::instance ()->handle_events (time); if (result == 0 && errno == ETIME) { ACE_DEBUG ((LM_DEBUG, "No more work left: timing out\n")); diff --git a/examples/Reactor/ReactorEx/test_talker.cpp b/examples/Reactor/ReactorEx/test_talker.cpp index 7b2d53ca9b5..6e4b62a677d 100644 --- a/examples/Reactor/ReactorEx/test_talker.cpp +++ b/examples/Reactor/ReactorEx/test_talker.cpp @@ -13,20 +13,20 @@ // This test application tests a wide range of events that can be // demultiplexed using various ACE utilities. Events used include // ^C events, reading from STDIN, vanilla Win32 events, thread -// exits, ReactorEx notifications, proactive reads, and proactive +// exits, Reactor notifications, proactive reads, and proactive // writes. // // The proactive I/O events are demultiplexed by the ACE_Proactor. // The thread exits, notications, and vanilla Win32 events are -// demultiplexed by the ACE_ReactorEx. To enable a single thread +// demultiplexed by the ACE_Reactor. To enable a single thread // to run all these events, the Proactor is integrated with the -// ReactorEx. +// Reactor. // // The test application prototypes a simple talk program. Two // instances of the application connect. Input from either console // is displayed on the others console also. Because of the evils // of Win32 STDIN, a separate thread is used to read from STDIN. -// To test the Proactor and ReactorEx, I/O between the remote +// To test the Proactor and Reactor, I/O between the remote // processes is performed proactively and interactions between the // STDIN thread and the main thread are performed reactively. // @@ -36,24 +36,24 @@ // describes how the partipants interact in response to the // multiple event types which occur. // -// The ReactorEx test application has the following participants: +// The Reactor test application has the following participants: // -// . ReactorEx -- The ReactorEx demultiplexes Win32 "waitable" +// . Reactor -- The Reactor demultiplexes Win32 "waitable" // events using WaitForMultipleObjects. // // . Proactor -- The proactor initiates and demultiplexes // overlapped I/O operations. The Proactor registers with the -// ReactorEx so that a single-thread can demultiplex all +// Reactor so that a single-thread can demultiplex all // application events. // // . STDIN_Handler -- STDIN_Handler is an Active Object which reads // from STDIN and forwards the input to the Peer_Handler. This // runs in a separate thread to make the test more interesting. // However, STDIN is "waitable", so in general it can be waited on -// by the ACE ReactorEx, thanks MicroSlush! +// by the ACE Reactor, thanks MicroSlush! // // . Peer_Handler -- The Peer_Handler connects to another instance -// of test_reactorEx. It Proactively reads and writes data to the +// of test_reactor. It Proactively reads and writes data to the // peer. When the STDIN_Handler gives it messages, it fowards them // to the remote peer. When it receives messages from the remote // peer, it prints the output to the console. @@ -73,35 +73,35 @@ // SIGINT. This just captures the exception so that the kernel // doesn't kill our process; We want to exit gracefully. It also // creates an Exit_Hook object which registers the -// STDIN_Handler's thread handle with the ReactorEx. The +// STDIN_Handler's thread handle with the Reactor. The // Exit_Hook will get called back when the STDIN_Handler thread // exits. After registering these, it blocks reading from STDIN. // -// Proactor -- is registered with the ReactorEx. +// Proactor -- is registered with the Reactor. // -// The main thread of control waits in the ReactorEx. +// The main thread of control waits in the Reactor. // // . STDIN events -- When the STDIN_Handler thread reads from // STDIN, it puts the message on Peer_Handler's message queue. It // then returns to reading from STDIN. // -// . Message enqueue -- The ReactorEx thread wakes up and calls +// . Message enqueue -- The Reactor thread wakes up and calls // Peer_Handler::handle_output. The Peer_Handler then tries to // dequeue a message from its message queue. If it can, the // message is Proactively sent to the remote peer. Note that the // Peer_Handler will be notified with this operation is complete. -// The Peer_Handler then falls back into the ReactorEx event loop. +// The Peer_Handler then falls back into the Reactor event loop. // // . Send complete event -- When a proactive send is complete, the -// Proactor is notified by the ReactorEx. The Proactor, in turn, +// Proactor is notified by the Reactor. The Proactor, in turn, // notifies the Peer_Handler. The Peer_Handler then checks for // more messages from the message queue. If there are any, it // tries to send them. If there are not, it returns to the -// ReactorEx event loop. +// Reactor event loop. // // . Read complete event -- When a proactive read is complete (the // Peer_Handler initiated a proactive read when it connected to the -// remote peer), the Proactor is notified by the ReactorEx. The +// remote peer), the Proactor is notified by the Reactor. The // Proactor, in turn notifies the Peer_Handler. If the read was // successful the Peer_Handler just displays the received msg to // the console and reinvokes a proactive read from the network @@ -115,7 +115,7 @@ // exit. // // . STDIN_Handler thread exits -- The Exit_Hook will get called -// back from the ReactorEx. Exit_Hook::handle_signal sets a flag +// back from the Reactor. Exit_Hook::handle_signal sets a flag // to end the event loop and returns. This will cause the // application to exit. // @@ -132,7 +132,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/Proactor.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" @@ -175,19 +175,19 @@ public: // passed to <open>. virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); - // We've been removed from the ReactorEx. + // We've been removed from the Reactor. virtual int handle_output (ACE_HANDLE fd); // Called when output events should start. Note that this is // automatically invoked by the - // <ACE_ReactorEx_Notificiation_Strategy>. + // <ACE_Reactor_Notificiation_Strategy>. private: ACE_SOCK_Stream stream_; // Socket that we have connected to the server. - ACE_ReactorEx_Notification_Strategy strategy_; - // The strategy object that the reactorEx uses to notify us when + ACE_Reactor_Notification_Strategy strategy_; + // The strategy object that the reactor uses to notify us when // something is added to the queue. // = Remote peer info. @@ -231,7 +231,7 @@ private: // signals along with the other things). void register_thread_exit_hook (void); - // Helper function to register with the ReactorEx for thread exit. + // Helper function to register with the Reactor for thread exit. virtual int handle_signal (int index, siginfo_t *, ucontext_t *); // The STDIN thread has exited. This means the user hit ^C. We can @@ -247,13 +247,13 @@ private: Peer_Handler::Peer_Handler (int argc, char *argv[]) : host_ (0), port_ (ACE_DEFAULT_SERVER_PORT), - strategy_ (ACE_ReactorEx::instance (), + strategy_ (ACE_Reactor::instance (), this, ACE_Event_Handler::WRITE_MASK), mb_ (BUFSIZ) { // This code sets up the message to notify us when a new message is - // added to the queue. Actually, the queue notifies ReactorEx which + // added to the queue. Actually, the queue notifies Reactor which // then notifies us. this->msg_queue ()->notification_strategy (&this->strategy_); @@ -356,7 +356,7 @@ Peer_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) // If a read failed, we will assume it's because the remote peer // went away. We will end the event loop. Since we're in the // main thread, we don't need to do a notify. - ACE_ReactorEx::end_event_loop(); + ACE_Reactor::end_event_loop(); return; } @@ -376,7 +376,7 @@ Peer_Handler::handle (void) const return this->stream_.get_handle (); } -// We've been removed from the ReactorEx. +// We've been removed from the Reactor. int Peer_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { @@ -461,7 +461,7 @@ STDIN_Handler::svc (void) mb->wr_ptr (read_result); // Note that this call will first enqueue mb onto the peer // handler's message queue, which will then turn around and - // notify the ReactorEx via the Notification_Strategy. This + // notify the Reactor via the Notification_Strategy. This // will subsequently signal the Peer_Handler, which will // react by calling back to its handle_output() method, // which dequeues the message and sends it to the peer @@ -480,7 +480,7 @@ STDIN_Handler::svc (void) return 0; } -// Register an exit hook with the reactorEx. +// Register an exit hook with the reactor. void STDIN_Handler::register_thread_exit_hook (void) @@ -490,7 +490,7 @@ STDIN_Handler::register_thread_exit_hook (void) // Register ourselves to get called back when our thread exits. - if (ACE_ReactorEx::instance ()-> + if (ACE_Reactor::instance ()-> register_handler (this, this->thr_handle_) == -1) ACE_ERROR ((LM_ERROR, "Exit_Hook Register failed.\n")); } @@ -503,14 +503,14 @@ STDIN_Handler::handle_signal (int, siginfo_t *si, ucontext_t *) { ACE_DEBUG ((LM_DEBUG, "(%t) STDIN thread has exited.\n")); ACE_ASSERT (this->thr_handle_ == si->si_handle_); - ACE_ReactorEx::end_event_loop(); + ACE_Reactor::end_event_loop(); return 0; } int main (int argc, char *argv[]) { - // Let the proactor know that it will be used with ReactorEx + // Let the proactor know that it will be used with Reactor ACE_Proactor proactor (0, 0, 1); ACE_Proactor::instance (&proactor); @@ -532,15 +532,15 @@ main (int argc, char *argv[]) "%p open failed, errno = %d.\n", "stdin_handler", errno), 0); - // Register proactor with ReactorEx so that we can demultiplex + // Register proactor with Reactor so that we can demultiplex // "waitable" events and I/O operations from a single thread. - if (ACE_ReactorEx::instance ()->register_handler + if (ACE_Reactor::instance ()->register_handler (ACE_Proactor::instance ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, "%p failed to register Proactor.\n", argv[0]), -1); // Run main event demultiplexor. - ACE_ReactorEx::run_event_loop (); + ACE_Reactor::run_event_loop (); return 0; } diff --git a/examples/Reactor/ReactorEx/test_timeouts.cpp b/examples/Reactor/ReactorEx/test_timeouts.cpp index ce5925ac679..c6d228fe2b6 100644 --- a/examples/Reactor/ReactorEx/test_timeouts.cpp +++ b/examples/Reactor/ReactorEx/test_timeouts.cpp @@ -10,7 +10,7 @@ // // = DESCRIPTION // -// This example application shows how to write ReactorEx event +// This example application shows how to write Reactor event // loops that handle events for some fixed amount of time. // // Run this example (without arguments) to see the timers @@ -24,7 +24,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/Service_Config.h" #include "ace/OS.h" @@ -58,20 +58,20 @@ main (int, char *[]) // Register a 3 second timer. ACE_Time_Value bar_tv (3); - ACE_ReactorEx::instance ()->schedule_timer (&handler, - (void *) "Bar", - bar_tv, - bar_tv); + ACE_Reactor::instance ()->schedule_timer (&handler, + (void *) "Bar", + bar_tv, + bar_tv); // Register a 2 second timer. ACE_Time_Value foo_tv (2); - ACE_ReactorEx::instance ()->schedule_timer (&handler, - (void *) "Foo", - foo_tv, - foo_tv); + ACE_Reactor::instance ()->schedule_timer (&handler, + (void *) "Foo", + foo_tv, + foo_tv); // Handle events for 12 seconds. ACE_Time_Value run_time (12); - 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", "main"), -1); return 0; diff --git a/examples/Reactor/WFMO_Reactor/reactorex.mak b/examples/Reactor/WFMO_Reactor/reactorex.mak index 23571beafe1..f8425100d05 100644 --- a/examples/Reactor/WFMO_Reactor/reactorex.mak +++ b/examples/Reactor/WFMO_Reactor/reactorex.mak @@ -52,7 +52,7 @@ NULL=nul !ENDIF
################################################################################
# Begin Project
-# PROP Target_Last_Scanned "Timeouts - Win32 Debug"
+# PROP Target_Last_Scanned "Registry_Changes - Win32 Debug"
RSC=rc.exe
CPP=cl.exe
@@ -89,8 +89,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Exceptions.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -150,8 +148,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Multithreading.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -211,8 +207,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Network_Events.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -272,8 +266,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Registration.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -333,8 +325,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Removals.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -394,8 +384,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Talker.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -454,8 +442,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Timeouts.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -515,8 +501,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Directory_Changes.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -558,15 +542,15 @@ LINK32_OBJS= \ OUTDIR=.\.
INTDIR=.\Debug
-ALL : "$(OUTDIR)\console_input.exe"
+ALL : "$(OUTDIR)\Console_Input.exe"
CLEAN :
-@erase "$(INTDIR)\test_console_input.obj"
-@erase "$(INTDIR)\vc40.idb"
-@erase "$(INTDIR)\vc40.pdb"
- -@erase "$(OUTDIR)\console_input.exe"
- -@erase "$(OUTDIR)\console_input.ilk"
- -@erase "$(OUTDIR)\console_input.pdb"
+ -@erase "$(OUTDIR)\Console_Input.exe"
+ -@erase "$(OUTDIR)\Console_Input.ilk"
+ -@erase "$(OUTDIR)\Console_Input.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -576,8 +560,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Console_Input.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -599,7 +581,7 @@ LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\ LINK32_OBJS= \
"$(INTDIR)\test_console_input.obj"
-"$(OUTDIR)\console_input.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\Console_Input.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -637,8 +619,6 @@ CLEAN : # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/Registry_Changes.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -667,6 +647,9 @@ LINK32_OBJS= \ !ENDIF
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
+ /Fp"$(INTDIR)/Exceptions.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
+
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
@@ -696,10 +679,6 @@ SOURCE=.\test_exceptions.cpp DEP_CPP_TEST_=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -719,15 +698,7 @@ DEP_CPP_TEST_=\ {$(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"\
@@ -737,9 +708,8 @@ 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"\
@@ -753,14 +723,9 @@ DEP_CPP_TEST_=\ {$(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"\
@@ -769,12 +734,6 @@ DEP_CPP_TEST_=\ {$(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"\
@@ -794,25 +753,13 @@ DEP_CPP_TEST_=\ {$(INCLUDE)}"\ace\Synch_T.i"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -832,10 +779,6 @@ SOURCE=.\test_multithreading.cpp DEP_CPP_TEST_M=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -857,15 +800,7 @@ DEP_CPP_TEST_M=\ {$(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"\
@@ -875,9 +810,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"\
@@ -894,14 +828,9 @@ 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"\
@@ -910,12 +839,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"\
@@ -945,23 +868,13 @@ 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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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\WFMO_Reactor.h"\
+ {$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -983,8 +896,6 @@ DEP_CPP_TEST_N=\ {$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1002,17 +913,10 @@ DEP_CPP_TEST_N=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1022,36 +926,19 @@ DEP_CPP_TEST_N=\ {$(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\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(INCLUDE)}"\ace\Shared_Object.i"\
+ {$(INCLUDE)}"\ace\Reactor_Impl.h"\
{$(INCLUDE)}"\ace\Signal.h"\
{$(INCLUDE)}"\ace\Signal.i"\
{$(INCLUDE)}"\ace\SOCK.h"\
@@ -1065,40 +952,22 @@ DEP_CPP_TEST_N=\ {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1119,10 +988,6 @@ SOURCE=.\test_registration.cpp DEP_CPP_TEST_R=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1140,17 +1005,6 @@ DEP_CPP_TEST_R=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1160,81 +1014,39 @@ DEP_CPP_TEST_R=\ {$(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\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(INCLUDE)}"\ace\Shared_Object.i"\
+ {$(INCLUDE)}"\ace\Reactor_Impl.h"\
{$(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"\
- {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1255,10 +1067,6 @@ SOURCE=.\test_removals.cpp DEP_CPP_TEST_RE=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1276,17 +1084,6 @@ DEP_CPP_TEST_RE=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1296,30 +1093,19 @@ DEP_CPP_TEST_RE=\ {$(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"\
@@ -1328,18 +1114,9 @@ DEP_CPP_TEST_RE=\ {$(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"\
- {$(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"\
@@ -1347,30 +1124,15 @@ DEP_CPP_TEST_RE=\ {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1423,8 +1185,6 @@ DEP_CPP_TEST_T=\ {$(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"\
@@ -1434,9 +1194,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"\
@@ -1453,14 +1212,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"\
@@ -1522,8 +1278,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"\
@@ -1544,10 +1298,6 @@ SOURCE=.\test_timeouts.cpp DEP_CPP_TEST_TI=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1565,17 +1315,6 @@ DEP_CPP_TEST_TI=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1585,30 +1324,19 @@ DEP_CPP_TEST_TI=\ {$(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"\
@@ -1617,18 +1345,9 @@ DEP_CPP_TEST_TI=\ {$(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"\
- {$(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"\
@@ -1636,30 +1355,15 @@ DEP_CPP_TEST_TI=\ {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1680,10 +1384,6 @@ SOURCE=.\test_directory_changes.cpp DEP_CPP_TEST_D=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1701,17 +1401,6 @@ DEP_CPP_TEST_D=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1721,81 +1410,39 @@ DEP_CPP_TEST_D=\ {$(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\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(INCLUDE)}"\ace\Shared_Object.i"\
+ {$(INCLUDE)}"\ace\Reactor_Impl.h"\
{$(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"\
- {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1817,10 +1464,6 @@ SOURCE=.\test_console_input.cpp DEP_CPP_TEST_C=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1838,17 +1481,6 @@ DEP_CPP_TEST_C=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1858,81 +1490,39 @@ DEP_CPP_TEST_C=\ {$(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\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(INCLUDE)}"\ace\Shared_Object.i"\
+ {$(INCLUDE)}"\ace\Reactor_Impl.h"\
{$(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"\
- {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
@@ -1953,10 +1543,6 @@ SOURCE=.\test_registry_changes.cpp DEP_CPP_TEST_REG=\
{$(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"\
{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
{$(INCLUDE)}"\ace\Auto_Ptr.h"\
@@ -1974,17 +1560,6 @@ DEP_CPP_TEST_REG=\ {$(INCLUDE)}"\ace\Free_List.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"\
@@ -1994,82 +1569,40 @@ DEP_CPP_TEST_REG=\ {$(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\Registry.h"\
- {$(INCLUDE)}"\ace\Service_Config.h"\
- {$(INCLUDE)}"\ace\Service_Config.i"\
- {$(INCLUDE)}"\ace\Service_Object.h"\
- {$(INCLUDE)}"\ace\Service_Object.i"\
- {$(INCLUDE)}"\ace\Shared_Object.h"\
- {$(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"\
- {$(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"\
{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
- {$(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"\
{$(INCLUDE)}"\ace\Thread.h"\
{$(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"\
- {$(INCLUDE)}"\ace\Timer_List.h"\
- {$(INCLUDE)}"\ace\Timer_List_T.cpp"\
- {$(INCLUDE)}"\ace\Timer_List_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\
{$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
- {$(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"\
{$(INCLUDE)}"\algobase.h"\
diff --git a/examples/Reactor/WFMO_Reactor/reactorex.mdp b/examples/Reactor/WFMO_Reactor/reactorex.mdp Binary files differindex 00f3e30ecb4..cf058b17b54 100644 --- a/examples/Reactor/WFMO_Reactor/reactorex.mdp +++ b/examples/Reactor/WFMO_Reactor/reactorex.mdp diff --git a/examples/Reactor/WFMO_Reactor/test_console_input.cpp b/examples/Reactor/WFMO_Reactor/test_console_input.cpp index 8da38cc3037..f76f678d9df 100644 --- a/examples/Reactor/WFMO_Reactor/test_console_input.cpp +++ b/examples/Reactor/WFMO_Reactor/test_console_input.cpp @@ -10,32 +10,32 @@ // // = DESCRIPTION // -// This application tests the working of ReactorEx when users are -// interested in console input. +// This application tests the working of WFMO_Reactor when users +// are interested in console input. // // = AUTHOR // Irfan Pyarali // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_ReactorEx &reactorEx); + Event_Handler (ACE_Reactor &reactor); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); }; -Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) +Event_Handler::Event_Handler (ACE_Reactor &reactor) { - this->reactorEx (&reactorEx); + this->reactor (&reactor); - if (this->reactorEx ()->register_handler (this, - ACE_STDIN) != 0) - ACE_ERROR ((LM_ERROR, "Registration with ReactorEx could not be done\n")); + if (this->reactor ()->register_handler (this, + ACE_STDIN) != 0) + ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } int @@ -47,12 +47,12 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) if (result <= 0) { - this->reactorEx ()->close (); + this->reactor ()->close (); ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::read"), -1); } if (ACE_OS::strcmp (__TEXT("quit\r\n"), buffer) == 0) - this->reactorEx ()->close (); + this->reactor ()->close (); ACE_DEBUG ((LM_DEBUG, "User input: %s", buffer)); @@ -63,19 +63,19 @@ int Event_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) { - ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from ReactorEx\n")); + ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n")); return 0; } int main (int, char *[]) { - ACE_ReactorEx reactorEx; - Event_Handler handler (reactorEx); + ACE_Reactor reactor; + Event_Handler handler (reactor); int result = 0; while (result != -1) - result = reactorEx.handle_events (); + result = reactor.handle_events (); return 0; } diff --git a/examples/Reactor/WFMO_Reactor/test_directory_changes.cpp b/examples/Reactor/WFMO_Reactor/test_directory_changes.cpp index 0761baa61d8..37a66afa5c6 100644 --- a/examples/Reactor/WFMO_Reactor/test_directory_changes.cpp +++ b/examples/Reactor/WFMO_Reactor/test_directory_changes.cpp @@ -10,15 +10,15 @@ // // = DESCRIPTION // -// This application tests the working of ReactorEx when users are -// interested in monitoring changes in the filesystem. +// This application tests the working of WFMO_Reactor when users +// are interested in monitoring changes in the filesystem. // // = AUTHOR // Irfan Pyarali // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" static int stop_test = 0; static LPCTSTR directory = __TEXT ("."); @@ -27,7 +27,7 @@ static LPCTSTR temp_file = __TEXT ("foo"); class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_ReactorEx &reactorEx); + Event_Handler (ACE_Reactor &reactor); ~Event_Handler (void); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, @@ -37,10 +37,10 @@ private: ACE_HANDLE handle_; }; -Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) +Event_Handler::Event_Handler (ACE_Reactor &reactor) : handle_ (ACE_INVALID_HANDLE) { - this->reactorEx (&reactorEx); + this->reactor (&reactor); int change_notification_flags = FILE_NOTIFY_CHANGE_FILE_NAME; @@ -51,9 +51,9 @@ Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) if (this->handle_ == ACE_INVALID_HANDLE) ACE_ERROR ((LM_ERROR, "FindFirstChangeNotification could not be setup\n")); - if (this->reactorEx ()->register_handler (this, - this->handle_) != 0) - ACE_ERROR ((LM_ERROR, "Registration with ReactorEx could not be done\n")); + if (this->reactor ()->register_handler (this, + this->handle_) != 0) + ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } Event_Handler::~Event_Handler (void) @@ -66,7 +66,7 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) ACE_DEBUG ((LM_DEBUG, "(%t) Something changed in this directory\n")); ::FindNextChangeNotification (this->handle_); if (stop_test) - this->reactorEx ()->close (); + this->reactor ()->close (); return 0; } @@ -74,7 +74,7 @@ int Event_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) { - ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from ReactorEx\n")); + ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n")); ::FindCloseChangeNotification (this->handle_); return 0; } @@ -101,14 +101,14 @@ worker (void) int main (int, char *[]) { - ACE_ReactorEx reactorEx; - Event_Handler handler (reactorEx); + ACE_Reactor reactor; + Event_Handler handler (reactor); ACE_ASSERT (ACE_OS::thr_create ((ACE_THR_FUNC) worker, 0, 0, 0) == 0); int result = 0; while (result != -1) - result = reactorEx.handle_events (); + result = reactor.handle_events (); return 0; } diff --git a/examples/Reactor/WFMO_Reactor/test_exceptions.cpp b/examples/Reactor/WFMO_Reactor/test_exceptions.cpp index 7a975ec1d12..1c7ca508978 100644 --- a/examples/Reactor/WFMO_Reactor/test_exceptions.cpp +++ b/examples/Reactor/WFMO_Reactor/test_exceptions.cpp @@ -10,11 +10,11 @@ // // = DESCRIPTION // -// This test application tests the state of ReactorEx when +// This test application tests the state of WFMO_Reactor when // exceptions occurs when executing user callbacks. // -// The thread count in ReactorEx is used to ensure that state of -// ReactorEx is not fouled up when exceptions occur in user code. +// The thread count in WFMO_Reactor is used to ensure that state of +// WFMO_Reactor is not fouled up when exceptions occur in user code. // This example also shows how to write event loops that survive // user exceptions // @@ -23,7 +23,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/WFMO_Reactor.h" class Event_Handler : public ACE_Event_Handler { @@ -51,25 +51,25 @@ private: ACE_Manual_Event event_; }; -class ACE_ReactorEx_Test +class ACE_WFMO_Reactor_Test { public: - static void doit () + static void doit (ACE_WFMO_Reactor &wfmo_reactor) { for (int i = 1; i <= 10; i++) { - ACE_DEBUG ((LM_DEBUG, "Active threads in ReactorEx (before handle_events) = %d\n", - ACE_ReactorEx::instance ()->active_threads_)); + ACE_DEBUG ((LM_DEBUG, "Active threads in WFMO_Reactor (before handle_events) = %d\n", + wfmo_reactor.active_threads_)); ACE_SEH_TRY { - ACE_ReactorEx::instance ()->handle_events (); + wfmo_reactor.handle_events (); } ACE_SEH_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { ACE_DEBUG ((LM_DEBUG, "Exception occurred\n")); } - ACE_DEBUG ((LM_DEBUG, "Active threads in ReactorEx (after handle_events) = %d\n", - ACE_ReactorEx::instance ()->active_threads_)); + ACE_DEBUG ((LM_DEBUG, "Active threads in WFMO_Reactor (after handle_events) = %d\n", + wfmo_reactor.active_threads_)); } } }; @@ -78,8 +78,9 @@ int main (int, char *[]) { Event_Handler handler; - ACE_ReactorEx::instance ()->register_handler (&handler); - ACE_ReactorEx_Test::doit (); + ACE_WFMO_Reactor wfmo_reactor; + wfmo_reactor.register_handler (&handler); + ACE_WFMO_Reactor_Test::doit (wfmo_reactor); return 0; } diff --git a/examples/Reactor/WFMO_Reactor/test_multithreading.cpp b/examples/Reactor/WFMO_Reactor/test_multithreading.cpp index 01fccc19350..62eaa01212e 100644 --- a/examples/Reactor/WFMO_Reactor/test_multithreading.cpp +++ b/examples/Reactor/WFMO_Reactor/test_multithreading.cpp @@ -9,10 +9,13 @@ // test_multithreading.cpp // // = DESCRIPTION +// // This application tests multiple threads simultaneously calling -// ReactorEx->handle_events(). It also shows how different threads -// can update the state of ReactorEx by registering and removing -// Event_Handlers. +// Reactor::handle_events(). It also shows how different threads +// can update the state of Reactor by registering and removing +// Event_Handlers. +// +// Note that this test will only work with WFMO_Reactor // // = AUTHOR // Irfan Pyarali @@ -20,11 +23,12 @@ // ============================================================================ #include "ace/Task.h" -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" +#include "ace/WFMO_Reactor.h" #include "ace/Get_Opt.h" static int concurrent_threads = 1; -static int number_of_handles = ACE_ReactorEx::DEFAULT_SIZE; +static int number_of_handles = ACE_Reactor::instance ()->size (); static int number_of_handles_to_signal = 1; static int interval = 2; static int iterations = 10; @@ -105,14 +109,14 @@ private: ACE_Auto_Event *events_; }; -// All threads do reactorEx->handle_events () +// All threads do reactor->handle_events () int Task_Handler::svc (void) { // Try to become the owner - ACE_ReactorEx::instance ()->owner (ACE_Thread::self ()); + ACE_Reactor::instance ()->owner (ACE_Thread::self ()); // Run the event loop. - return ACE_ReactorEx::run_event_loop (); + return ACE_Reactor::run_event_loop (); } Task_Handler::Task_Handler (size_t number_of_handles, @@ -122,9 +126,9 @@ Task_Handler::Task_Handler (size_t number_of_handles, for (size_t i = 0; i < number_of_handles; i++) { - if (ACE_ReactorEx::instance ()->register_handler (this, - this->events_[i].handle ()) == -1) - ACE_ERROR ((LM_ERROR, "%p\t cannot register handle %d with ReactorEx\n", + if (ACE_Reactor::instance ()->register_handler (this, + this->events_[i].handle ()) == -1) + ACE_ERROR ((LM_ERROR, "%p\t cannot register handle %d with Reactor\n", "Task_Handler::Task_Handler", i)); } // Make us an active object. @@ -144,21 +148,21 @@ int Task_Handler::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *) { // When signaled, print message, remove self, and add self - // This will force ReactorEx to update its internal handle tables + // This will force Reactor to update its internal handle tables ACE_DEBUG ((LM_DEBUG, "(%t) handle_signal() called: handle value = %d\n", siginfo->si_handle_)); - if (ACE_ReactorEx::instance ()->remove_handler (siginfo->si_handle_, - ACE_Event_Handler::DONT_CALL) == -1) + if (ACE_Reactor::instance ()->remove_handler (siginfo->si_handle_, + ACE_Event_Handler::DONT_CALL) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\tTask cannot be unregistered from ReactorEx: handle value = %d\n", + "(%t) %p\tTask cannot be unregistered from Reactor: handle value = %d\n", "Task_Handler::handle_signal", siginfo->si_handle_), -1); - if (ACE_ReactorEx::instance ()->register_handler (this, - siginfo->si_handle_) == -1) + if (ACE_Reactor::instance ()->register_handler (this, + siginfo->si_handle_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "(%t) %p\tTask cannot be registered with ReactorEx: handle value = %d\n", + "(%t) %p\tTask cannot be registered with Reactor: handle value = %d\n", "Task_Handler::handle_signal", siginfo->si_handle_), -1); return 0; @@ -210,9 +214,9 @@ main (int argc, char **argv) ACE_DEBUG ((LM_DEBUG, "********************************************************\n")); // Setup a timer for the task - if (ACE_ReactorEx::instance ()->schedule_timer (&task, - (void *) i, - 0) == -1) + if (ACE_Reactor::instance ()->schedule_timer (&task, + (void *) i, + 0) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1); for (int i = 0; i < number_of_handles_to_signal; i++) @@ -223,8 +227,8 @@ main (int argc, char **argv) // Sleep for a while ACE_OS::sleep (interval); - // Close ReactorEx - ACE_ReactorEx::instance ()->close (); + // Close Reactor + ACE_Reactor::instance ()->close (); // Wait for all threads to exit ACE_Thread_Manager::instance ()->wait (); diff --git a/examples/Reactor/WFMO_Reactor/test_network_events.cpp b/examples/Reactor/WFMO_Reactor/test_network_events.cpp index 5ab83cb2d23..a954f626e5e 100644 --- a/examples/Reactor/WFMO_Reactor/test_network_events.cpp +++ b/examples/Reactor/WFMO_Reactor/test_network_events.cpp @@ -10,7 +10,7 @@ // // = DESCRIPTION // -// This application tests ReactorEx to make sure that it responds +// This application tests Reactor to make sure that it responds // correctly to different kinds of network events. // // The test starts off by creating a Network_Listener, that listens @@ -31,14 +31,14 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Stream.h" #include "ace/SOCK_Acceptor.h" // Globals for this test int stop_test = 0; -ACE_ReactorEx reactorEx; +ACE_Reactor reactor; class Network_Handler : public ACE_Event_Handler { @@ -58,11 +58,11 @@ public: Network_Handler::Network_Handler (ACE_SOCK_Stream &s) : stream_ (s) { - this->reactorEx (&::reactorEx); + this->reactor (&::reactor); ACE_Reactor_Mask mask = ACE_Event_Handler::READ_MASK | ACE_Event_Handler::CLOSE_MASK; - ACE_ASSERT (this->reactorEx ()->register_handler (this, - mask) == 0); + ACE_ASSERT (this->reactor ()->register_handler (this, + mask) == 0); } ACE_HANDLE @@ -101,7 +101,7 @@ Network_Handler::handle_close (ACE_HANDLE handle, if (close_mask == ACE_Event_Handler::CLOSE_MASK) { ACE_Reactor_Mask mask = ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::ALL_EVENTS_MASK; - this->reactorEx ()->remove_handler (this, mask); + this->reactor ()->remove_handler (this, mask); } this->stream_.close (); @@ -130,9 +130,9 @@ Network_Listener::Network_Listener (void) : local_address_ (ACE_DEFAULT_SERVER_PORT), acceptor_ (local_address_, 1) { - this->reactorEx (&::reactorEx); - ACE_ASSERT (this->reactorEx ()->register_handler (this, - ACE_Event_Handler::ACCEPT_MASK) == 0); + this->reactor (&::reactor); + ACE_ASSERT (this->reactor ()->register_handler (this, + ACE_Event_Handler::ACCEPT_MASK) == 0); } ACE_HANDLE @@ -177,7 +177,7 @@ main (int, char *[]) int result = 0; while (!stop_test && result != -1) { - result = reactorEx.handle_events (); + result = reactor.handle_events (); } return 0; }; diff --git a/examples/Reactor/WFMO_Reactor/test_registration.cpp b/examples/Reactor/WFMO_Reactor/test_registration.cpp index 24fd6a0cedb..82456387966 100644 --- a/examples/Reactor/WFMO_Reactor/test_registration.cpp +++ b/examples/Reactor/WFMO_Reactor/test_registration.cpp @@ -11,18 +11,18 @@ // = DESCRIPTION // // This test application tests a wide range of registration, -// suspension, resumption, and removal of events from ReactorEx. +// suspension, resumption, and removal of events from Reactor. // -// The application initially registers two events with ReactorEx. A +// The application initially registers two events with Reactor. A // auxiliary thread is created to do the signaling on the // events. When the first event is signaled, the event is suspended -// from ReactorEx. The event is then signaled again, but is "lost" +// from Reactor. The event is then signaled again, but is "lost" // since the handler has been suspended. When the second event is // signal, the first event is resumed and the second is // suspended. When the first event is signaled again, both events -// are removed from ReactorEx. +// are removed from Reactor. // -// This test shows off the following features of ReactorEx: +// This test shows off the following features of Reactor: // - Registration // - Suspension // - Resumption @@ -33,11 +33,11 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" // Globals for this test int stop_test = 0; -ACE_ReactorEx reactorEx; +ACE_Reactor reactor; class Simple_Handler : public ACE_Event_Handler @@ -72,21 +72,21 @@ Simple_Handler::handle_signal (int signum, siginfo_t *s, ucontext_t *) if (this->handle_signal_count_ == 1) { ACE_DEBUG ((LM_DEBUG, "suspending handle = %d\n", event1_.handle ())); - this->reactorEx ()->suspend_handler (event1_.handle ()); + this->reactor ()->suspend_handler (event1_.handle ()); } else if (this->handle_signal_count_ == 2) { ACE_DEBUG ((LM_DEBUG, "resuming handle = %d\n", event1_.handle ())); - this->reactorEx ()->resume_handler (event1_.handle ()); + this->reactor ()->resume_handler (event1_.handle ()); ACE_DEBUG ((LM_DEBUG, "suspending handle = %d\n", event2_.handle ())); - this->reactorEx ()->suspend_handler (event2_.handle ()); + this->reactor ()->suspend_handler (event2_.handle ()); } else if (this->handle_signal_count_ == 3) { ACE_DEBUG ((LM_DEBUG, "removing handle = %d\n", event1_.handle ())); - this->reactorEx ()->remove_handler (event1_.handle ()); + this->reactor ()->remove_handler (event1_.handle (), ACE_Event_Handler::NULL_MASK); ACE_DEBUG ((LM_DEBUG, "removing handle = %d\n", event2_.handle ())); - this->reactorEx ()->remove_handler (event2_.handle ()); + this->reactor ()->remove_handler (event2_.handle (), ACE_Event_Handler::NULL_MASK); } return 0; } @@ -138,17 +138,17 @@ worker (void) int main (int, char *[]) { - ACE_ASSERT (reactorEx.register_handler (&simple_handler, - simple_handler.event1_.handle ()) == 0); - ACE_ASSERT (reactorEx.register_handler (&simple_handler, - simple_handler.event2_.handle ()) == 0); + ACE_ASSERT (reactor.register_handler (&simple_handler, + simple_handler.event1_.handle ()) == 0); + ACE_ASSERT (reactor.register_handler (&simple_handler, + simple_handler.event2_.handle ()) == 0); ACE_ASSERT (ACE_OS::thr_create ((ACE_THR_FUNC) worker, 0, 0, 0) == 0); int result = 0; while (!stop_test && result != -1) { - result = reactorEx.handle_events (); + result = reactor.handle_events (); } return 0; }; diff --git a/examples/Reactor/WFMO_Reactor/test_registry_changes.cpp b/examples/Reactor/WFMO_Reactor/test_registry_changes.cpp index 3f42bd6a831..b4ae55edab9 100644 --- a/examples/Reactor/WFMO_Reactor/test_registry_changes.cpp +++ b/examples/Reactor/WFMO_Reactor/test_registry_changes.cpp @@ -10,7 +10,7 @@ // // = DESCRIPTION // -// This application tests the working of ReactorEx when users are +// This application tests the working of Reactor when users are // interested in monitoring changes in the registry. // // = AUTHOR @@ -18,7 +18,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/Registry.h" static int stop_test = 0; @@ -28,7 +28,7 @@ static LPCTSTR temp_context_name = __TEXT ("ACE temporary context"); class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_ReactorEx &reactorEx); + Event_Handler (ACE_Reactor &reactor); ~Event_Handler (void); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, @@ -40,10 +40,10 @@ private: ACE_Registry::Naming_Context context_; }; -Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) +Event_Handler::Event_Handler (ACE_Reactor &reactor) : context_ (context_to_monitor) { - this->reactorEx (&reactorEx); + this->reactor (&reactor); if (::RegNotifyChangeKeyValue (this->context_.key (), // handle of key to watch FALSE, // flag for subkey notification @@ -53,9 +53,9 @@ Event_Handler::Event_Handler (ACE_ReactorEx &reactorEx) ) != ERROR_SUCCESS) ACE_ERROR ((LM_ERROR, "RegNotifyChangeKeyValue could not be setup\n")); - if (this->reactorEx ()->register_handler (this, - this->event_.handle ()) != 0) - ACE_ERROR ((LM_ERROR, "Registration with ReactorEx could not be done\n")); + if (this->reactor ()->register_handler (this, + this->event_.handle ()) != 0) + ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } Event_Handler::~Event_Handler (void) @@ -68,7 +68,7 @@ Event_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) ACE_DEBUG ((LM_DEBUG, "(%t) Something changed in the Registry\n")); if (stop_test) - this->reactorEx ()->close (); + this->reactor ()->close (); else if (::RegNotifyChangeKeyValue (this->context_.key (), // handle of key to watch FALSE, // flag for subkey notification REG_NOTIFY_CHANGE_NAME, // changes to be reported @@ -84,7 +84,7 @@ int Event_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) { - ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from ReactorEx\n")); + ACE_DEBUG ((LM_DEBUG, "Event_Handler removed from Reactor\n")); return 0; } @@ -120,14 +120,14 @@ worker (Event_Handler *event_handler) int main (int, char *[]) { - ACE_ReactorEx reactorEx; - Event_Handler handler (reactorEx); + ACE_Reactor reactor; + Event_Handler handler (reactor); ACE_ASSERT (ACE_OS::thr_create ((ACE_THR_FUNC) worker, &handler, 0, 0) == 0); int result = 0; while (result != -1) - result = reactorEx.handle_events (); + result = reactor.handle_events (); return 0; } diff --git a/examples/Reactor/WFMO_Reactor/test_removals.cpp b/examples/Reactor/WFMO_Reactor/test_removals.cpp index fda33df704a..3f24213e561 100644 --- a/examples/Reactor/WFMO_Reactor/test_removals.cpp +++ b/examples/Reactor/WFMO_Reactor/test_removals.cpp @@ -10,9 +10,9 @@ // // = DESCRIPTION // -// Tests the ReactorEx's ability to handle simultaneous events. If +// Tests the Reactor's ability to handle simultaneous events. If // you pass anything on the command-line, then each handler -// requests to be removed from the ReactorEx after each event. +// requests to be removed from the Reactor after each event. // // = AUTHOR // Tim Harrison @@ -20,7 +20,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/Service_Config.h" #include "ace/Synch.h" @@ -30,7 +30,7 @@ class Event_Handler : public ACE_Event_Handler // // = DESCRIPTION // -// Creates event. Registers with ReactorEx. Signals event. If +// Creates event. Registers with Reactor. Signals event. If // created with -close_down- it returns -1 from handle signal. { public: @@ -39,9 +39,9 @@ public: : event_number_ (event_number), close_down_ (close_down) { - if (ACE_ReactorEx::instance ()->register_handler (this, - this->event_.handle ()) == -1) - ACE_ERROR ((LM_ERROR, "%p\tevent handler %d cannot be added to ReactorEx\n", "", event_number_)); + if (ACE_Reactor::instance ()->register_handler (this, + this->event_.handle ()) == -1) + ACE_ERROR ((LM_ERROR, "%p\tevent handler %d cannot be added to Reactor\n", "", event_number_)); this->event_.signal (); } @@ -83,14 +83,14 @@ main (int argc, char *argv[]) { int close_down = argc > 1 ? 1 : 0; - for (int i = 1; i <= ACE_ReactorEx::DEFAULT_SIZE; i++) + for (int i = 1; i <= ACE_Reactor::instance ()->size (); i++) new Event_Handler (i, close_down); int result = 0; ACE_Time_Value time (1); while (1) { - result = ACE_ReactorEx::instance ()->handle_events (time); + result = ACE_Reactor::instance ()->handle_events (time); if (result == 0 && errno == ETIME) { ACE_DEBUG ((LM_DEBUG, "No more work left: timing out\n")); diff --git a/examples/Reactor/WFMO_Reactor/test_talker.cpp b/examples/Reactor/WFMO_Reactor/test_talker.cpp index 7b2d53ca9b5..6e4b62a677d 100644 --- a/examples/Reactor/WFMO_Reactor/test_talker.cpp +++ b/examples/Reactor/WFMO_Reactor/test_talker.cpp @@ -13,20 +13,20 @@ // This test application tests a wide range of events that can be // demultiplexed using various ACE utilities. Events used include // ^C events, reading from STDIN, vanilla Win32 events, thread -// exits, ReactorEx notifications, proactive reads, and proactive +// exits, Reactor notifications, proactive reads, and proactive // writes. // // The proactive I/O events are demultiplexed by the ACE_Proactor. // The thread exits, notications, and vanilla Win32 events are -// demultiplexed by the ACE_ReactorEx. To enable a single thread +// demultiplexed by the ACE_Reactor. To enable a single thread // to run all these events, the Proactor is integrated with the -// ReactorEx. +// Reactor. // // The test application prototypes a simple talk program. Two // instances of the application connect. Input from either console // is displayed on the others console also. Because of the evils // of Win32 STDIN, a separate thread is used to read from STDIN. -// To test the Proactor and ReactorEx, I/O between the remote +// To test the Proactor and Reactor, I/O between the remote // processes is performed proactively and interactions between the // STDIN thread and the main thread are performed reactively. // @@ -36,24 +36,24 @@ // describes how the partipants interact in response to the // multiple event types which occur. // -// The ReactorEx test application has the following participants: +// The Reactor test application has the following participants: // -// . ReactorEx -- The ReactorEx demultiplexes Win32 "waitable" +// . Reactor -- The Reactor demultiplexes Win32 "waitable" // events using WaitForMultipleObjects. // // . Proactor -- The proactor initiates and demultiplexes // overlapped I/O operations. The Proactor registers with the -// ReactorEx so that a single-thread can demultiplex all +// Reactor so that a single-thread can demultiplex all // application events. // // . STDIN_Handler -- STDIN_Handler is an Active Object which reads // from STDIN and forwards the input to the Peer_Handler. This // runs in a separate thread to make the test more interesting. // However, STDIN is "waitable", so in general it can be waited on -// by the ACE ReactorEx, thanks MicroSlush! +// by the ACE Reactor, thanks MicroSlush! // // . Peer_Handler -- The Peer_Handler connects to another instance -// of test_reactorEx. It Proactively reads and writes data to the +// of test_reactor. It Proactively reads and writes data to the // peer. When the STDIN_Handler gives it messages, it fowards them // to the remote peer. When it receives messages from the remote // peer, it prints the output to the console. @@ -73,35 +73,35 @@ // SIGINT. This just captures the exception so that the kernel // doesn't kill our process; We want to exit gracefully. It also // creates an Exit_Hook object which registers the -// STDIN_Handler's thread handle with the ReactorEx. The +// STDIN_Handler's thread handle with the Reactor. The // Exit_Hook will get called back when the STDIN_Handler thread // exits. After registering these, it blocks reading from STDIN. // -// Proactor -- is registered with the ReactorEx. +// Proactor -- is registered with the Reactor. // -// The main thread of control waits in the ReactorEx. +// The main thread of control waits in the Reactor. // // . STDIN events -- When the STDIN_Handler thread reads from // STDIN, it puts the message on Peer_Handler's message queue. It // then returns to reading from STDIN. // -// . Message enqueue -- The ReactorEx thread wakes up and calls +// . Message enqueue -- The Reactor thread wakes up and calls // Peer_Handler::handle_output. The Peer_Handler then tries to // dequeue a message from its message queue. If it can, the // message is Proactively sent to the remote peer. Note that the // Peer_Handler will be notified with this operation is complete. -// The Peer_Handler then falls back into the ReactorEx event loop. +// The Peer_Handler then falls back into the Reactor event loop. // // . Send complete event -- When a proactive send is complete, the -// Proactor is notified by the ReactorEx. The Proactor, in turn, +// Proactor is notified by the Reactor. The Proactor, in turn, // notifies the Peer_Handler. The Peer_Handler then checks for // more messages from the message queue. If there are any, it // tries to send them. If there are not, it returns to the -// ReactorEx event loop. +// Reactor event loop. // // . Read complete event -- When a proactive read is complete (the // Peer_Handler initiated a proactive read when it connected to the -// remote peer), the Proactor is notified by the ReactorEx. The +// remote peer), the Proactor is notified by the Reactor. The // Proactor, in turn notifies the Peer_Handler. If the read was // successful the Peer_Handler just displays the received msg to // the console and reinvokes a proactive read from the network @@ -115,7 +115,7 @@ // exit. // // . STDIN_Handler thread exits -- The Exit_Hook will get called -// back from the ReactorEx. Exit_Hook::handle_signal sets a flag +// back from the Reactor. Exit_Hook::handle_signal sets a flag // to end the event loop and returns. This will cause the // application to exit. // @@ -132,7 +132,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/Proactor.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" @@ -175,19 +175,19 @@ public: // passed to <open>. virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); - // We've been removed from the ReactorEx. + // We've been removed from the Reactor. virtual int handle_output (ACE_HANDLE fd); // Called when output events should start. Note that this is // automatically invoked by the - // <ACE_ReactorEx_Notificiation_Strategy>. + // <ACE_Reactor_Notificiation_Strategy>. private: ACE_SOCK_Stream stream_; // Socket that we have connected to the server. - ACE_ReactorEx_Notification_Strategy strategy_; - // The strategy object that the reactorEx uses to notify us when + ACE_Reactor_Notification_Strategy strategy_; + // The strategy object that the reactor uses to notify us when // something is added to the queue. // = Remote peer info. @@ -231,7 +231,7 @@ private: // signals along with the other things). void register_thread_exit_hook (void); - // Helper function to register with the ReactorEx for thread exit. + // Helper function to register with the Reactor for thread exit. virtual int handle_signal (int index, siginfo_t *, ucontext_t *); // The STDIN thread has exited. This means the user hit ^C. We can @@ -247,13 +247,13 @@ private: Peer_Handler::Peer_Handler (int argc, char *argv[]) : host_ (0), port_ (ACE_DEFAULT_SERVER_PORT), - strategy_ (ACE_ReactorEx::instance (), + strategy_ (ACE_Reactor::instance (), this, ACE_Event_Handler::WRITE_MASK), mb_ (BUFSIZ) { // This code sets up the message to notify us when a new message is - // added to the queue. Actually, the queue notifies ReactorEx which + // added to the queue. Actually, the queue notifies Reactor which // then notifies us. this->msg_queue ()->notification_strategy (&this->strategy_); @@ -356,7 +356,7 @@ Peer_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) // If a read failed, we will assume it's because the remote peer // went away. We will end the event loop. Since we're in the // main thread, we don't need to do a notify. - ACE_ReactorEx::end_event_loop(); + ACE_Reactor::end_event_loop(); return; } @@ -376,7 +376,7 @@ Peer_Handler::handle (void) const return this->stream_.get_handle (); } -// We've been removed from the ReactorEx. +// We've been removed from the Reactor. int Peer_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { @@ -461,7 +461,7 @@ STDIN_Handler::svc (void) mb->wr_ptr (read_result); // Note that this call will first enqueue mb onto the peer // handler's message queue, which will then turn around and - // notify the ReactorEx via the Notification_Strategy. This + // notify the Reactor via the Notification_Strategy. This // will subsequently signal the Peer_Handler, which will // react by calling back to its handle_output() method, // which dequeues the message and sends it to the peer @@ -480,7 +480,7 @@ STDIN_Handler::svc (void) return 0; } -// Register an exit hook with the reactorEx. +// Register an exit hook with the reactor. void STDIN_Handler::register_thread_exit_hook (void) @@ -490,7 +490,7 @@ STDIN_Handler::register_thread_exit_hook (void) // Register ourselves to get called back when our thread exits. - if (ACE_ReactorEx::instance ()-> + if (ACE_Reactor::instance ()-> register_handler (this, this->thr_handle_) == -1) ACE_ERROR ((LM_ERROR, "Exit_Hook Register failed.\n")); } @@ -503,14 +503,14 @@ STDIN_Handler::handle_signal (int, siginfo_t *si, ucontext_t *) { ACE_DEBUG ((LM_DEBUG, "(%t) STDIN thread has exited.\n")); ACE_ASSERT (this->thr_handle_ == si->si_handle_); - ACE_ReactorEx::end_event_loop(); + ACE_Reactor::end_event_loop(); return 0; } int main (int argc, char *argv[]) { - // Let the proactor know that it will be used with ReactorEx + // Let the proactor know that it will be used with Reactor ACE_Proactor proactor (0, 0, 1); ACE_Proactor::instance (&proactor); @@ -532,15 +532,15 @@ main (int argc, char *argv[]) "%p open failed, errno = %d.\n", "stdin_handler", errno), 0); - // Register proactor with ReactorEx so that we can demultiplex + // Register proactor with Reactor so that we can demultiplex // "waitable" events and I/O operations from a single thread. - if (ACE_ReactorEx::instance ()->register_handler + if (ACE_Reactor::instance ()->register_handler (ACE_Proactor::instance ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, "%p failed to register Proactor.\n", argv[0]), -1); // Run main event demultiplexor. - ACE_ReactorEx::run_event_loop (); + ACE_Reactor::run_event_loop (); return 0; } diff --git a/examples/Reactor/WFMO_Reactor/test_timeouts.cpp b/examples/Reactor/WFMO_Reactor/test_timeouts.cpp index ce5925ac679..c6d228fe2b6 100644 --- a/examples/Reactor/WFMO_Reactor/test_timeouts.cpp +++ b/examples/Reactor/WFMO_Reactor/test_timeouts.cpp @@ -10,7 +10,7 @@ // // = DESCRIPTION // -// This example application shows how to write ReactorEx event +// This example application shows how to write Reactor event // loops that handle events for some fixed amount of time. // // Run this example (without arguments) to see the timers @@ -24,7 +24,7 @@ // // ============================================================================ -#include "ace/ReactorEx.h" +#include "ace/Reactor.h" #include "ace/Service_Config.h" #include "ace/OS.h" @@ -58,20 +58,20 @@ main (int, char *[]) // Register a 3 second timer. ACE_Time_Value bar_tv (3); - ACE_ReactorEx::instance ()->schedule_timer (&handler, - (void *) "Bar", - bar_tv, - bar_tv); + ACE_Reactor::instance ()->schedule_timer (&handler, + (void *) "Bar", + bar_tv, + bar_tv); // Register a 2 second timer. ACE_Time_Value foo_tv (2); - ACE_ReactorEx::instance ()->schedule_timer (&handler, - (void *) "Foo", - foo_tv, - foo_tv); + ACE_Reactor::instance ()->schedule_timer (&handler, + (void *) "Foo", + foo_tv, + foo_tv); // Handle events for 12 seconds. ACE_Time_Value run_time (12); - 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", "main"), -1); return 0; |