*** empty log message ***

2 files changed, 206 insertions, 12 deletions

diff --git a/examples/Reactor/Misc/Misc.mak b/examples/Reactor/Misc/Misc.mak
index 063f0ecbe6b..ca862d8f00c 100644
--- a/examples/Reactor/Misc/Misc.mak
+++ b/examples/Reactor/Misc/Misc.mak
@@ -4,21 +4,24 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

 !IF "$(CFG)" == ""

-CFG=timer_queue - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to timer_queue - Win32 Debug.

+CFG=notification - Win32 Debug

+!MESSAGE No configuration specified.  Defaulting to notification - Win32 Debug.

 !ENDIF 

 

-!IF "$(CFG)" != "timer_queue - Win32 Debug"

+!IF "$(CFG)" != "timer_queue - Win32 Debug" && "$(CFG)" !=\

+ "notification - Win32 Debug"

 !MESSAGE Invalid configuration "$(CFG)" specified.

 !MESSAGE You can specify a configuration when running NMAKE on this makefile

 !MESSAGE by defining the macro CFG on the command line.  For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Misc.mak" CFG="timer_queue - Win32 Debug"

+!MESSAGE NMAKE /f "Misc.mak" CFG="notification - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "timer_queue - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

+!MESSAGE "notification - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 !ERROR An invalid configuration is specified.

 !ENDIF 

@@ -30,8 +33,12 @@ NULL=nul
 !ENDIF 

 ################################################################################

 # Begin Project

-CPP=cl.exe

+# PROP Target_Last_Scanned "timer_queue - Win32 Debug"

 RSC=rc.exe

+CPP=cl.exe

+

+!IF  "$(CFG)" == "timer_queue - Win32 Debug"

+

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "timer_queue\Debug"

@@ -63,6 +70,8 @@ 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)/timer_queue.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -87,8 +96,67 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

+!ELSEIF  "$(CFG)" == "notification - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "notification\Debug"

+# PROP BASE Intermediate_Dir "notification\Debug"

+# PROP BASE Target_Dir "notification"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "Debug"

+# PROP Target_Dir "notification"

+OUTDIR=.\.

+INTDIR=.\Debug

+

+ALL : "$(OUTDIR)\notification.exe"

+

+CLEAN : 

+	-@erase "$(INTDIR)\notification.obj"

+	-@erase "$(INTDIR)\vc40.idb"

+	-@erase "$(INTDIR)\vc40.pdb"

+	-@erase "$(OUTDIR)\notification.exe"

+	-@erase "$(OUTDIR)\notification.ilk"

+	-@erase "$(OUTDIR)\notification.pdb"

+

+"$(OUTDIR)" :

+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

+

+"$(INTDIR)" :

+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

+

+# 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)/timer_queue.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

+ /Fp"$(INTDIR)/notification.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+BSC32_FLAGS=/nologo /o"$(OUTDIR)/notification.bsc" 

+BSC32_SBRS= \

+	

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

+# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

+LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

+ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

+ odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

+ /pdb:"$(OUTDIR)/notification.pdb" /debug /machine:I386\

+ /out:"$(OUTDIR)/notification.exe" 

+LINK32_OBJS= \

+	"$(INTDIR)\notification.obj"

+

+"$(OUTDIR)\notification.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

+    $(LINK32) @<<

+  $(LINK32_FLAGS) $(LINK32_OBJS)

+<<

+

+!ENDIF 

+

 CPP_OBJS=.\Debug/

 CPP_SBRS=.\.

 

@@ -149,15 +217,16 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.cpp"\

 	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_List.cpp"\

+	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

+	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

 	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.cpp"\

+	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

+	{$(INCLUDE)}"\ace\Timer_List_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.i"\

-	{$(INCLUDE)}"\ace\Timers.h"\

-	{$(INCLUDE)}"\ace\Timers.i"\

+	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

+	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

+	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -167,5 +236,130 @@ DEP_CPP_TEST_=\
 

 # End Source File

 # End Target

+################################################################################

+# Begin Target

+

+# Name "notification - Win32 Debug"

+################################################################################

+# Begin Source File

+

+SOURCE=.\notification.cpp

+DEP_CPP_NOTIF=\

+	{$(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\config-win32-common.h"\

+	{$(INCLUDE)}"\ace\config.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

+	{$(INCLUDE)}"\ace\Handle_Set.h"\

+	{$(INCLUDE)}"\ace\Handle_Set.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"\

+	{$(INCLUDE)}"\ace\Log_Record.i"\

+	{$(INCLUDE)}"\ace\Malloc.h"\

+	{$(INCLUDE)}"\ace\Malloc.i"\

+	{$(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\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\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\Set.cpp"\

+	{$(INCLUDE)}"\ace\Set.h"\

+	{$(INCLUDE)}"\ace\Set.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\Stack.cpp"\

+	{$(INCLUDE)}"\ace\Stack.h"\

+	{$(INCLUDE)}"\ace\Stack.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"\

+	

+

+"$(INTDIR)\notification.obj" : $(SOURCE) $(DEP_CPP_NOTIF) "$(INTDIR)"

+

+

+# End Source File

+# End Target

 # End Project

 ################################################################################

diff --git a/examples/Reactor/Misc/Misc.mdp b/examples/Reactor/Misc/Misc.mdp
index 542188acff0..b6222b653f6 100644
--- a/examples/Reactor/Misc/Misc.mdp
+++ b/examples/Reactor/Misc/Misc.mdp