*** empty log message ***

2 files changed, 181 insertions, 149 deletions

diff --git a/performance-tests/Misc/misc.mak b/performance-tests/Misc/misc.mak
index 50fb507e28e..ee92d8d715c 100644
--- a/performance-tests/Misc/misc.mak
+++ b/performance-tests/Misc/misc.mak
@@ -4,8 +4,9 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

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

-CFG=test_naming - Win32 Debug

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

+CFG=childbirth_time - Win32 Debug

+!MESSAGE No configuration specified.  Defaulting to childbirth_time - Win32\

+ Debug.

 !ENDIF 

 

 !IF "$(CFG)" != "context_switch_time - Win32 Release" && "$(CFG)" !=\

@@ -13,12 +14,13 @@ CFG=test_naming - Win32 Debug
  && "$(CFG)" != "test_mutex - Win32 Debug" && "$(CFG)" !=\

  "test_singleton - Win32 Release" && "$(CFG)" != "test_singleton - Win32 Debug"\

  && "$(CFG)" != "test_naming - Win32 Release" && "$(CFG)" !=\

- "test_naming - Win32 Debug"

+ "test_naming - Win32 Debug" && "$(CFG)" != "childbirth_time - Win32 Release" &&\

+ "$(CFG)" != "childbirth_time - 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="test_naming - Win32 Debug"

+!MESSAGE NMAKE /f "misc.mak" CFG="childbirth_time - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -38,6 +40,10 @@ CFG=test_naming - Win32 Debug
  "Win32 (x86) Console Application")

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

  "Win32 (x86) Console Application")

+!MESSAGE "childbirth_time - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

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

+ "Win32 (x86) Console Application")

 !MESSAGE 

 !ERROR An invalid configuration is specified.

 !ENDIF 

@@ -49,8 +55,9 @@ NULL=nul
 !ENDIF 

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

 # Begin Project

-RSC=rc.exe

+# PROP Target_Last_Scanned "test_naming - Win32 Debug"

 CPP=cl.exe

+RSC=rc.exe

 

 !IF  "$(CFG)" == "context_switch_time - Win32 Release"

 

@@ -523,6 +530,124 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

+!ELSEIF  "$(CFG)" == "childbirth_time - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "childbirth_time\Release"

+# PROP BASE Intermediate_Dir "childbirth_time\Release"

+# PROP BASE Target_Dir "childbirth_time"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\Release"

+# PROP Target_Dir "childbirth_time"

+OUTDIR=.\.

+INTDIR=.\Release

+

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

+

+CLEAN : 

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

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

+

+"$(OUTDIR)" :

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

+

+"$(INTDIR)" :

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

+

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\

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

+CPP_OBJS=.\.\Release/

+CPP_SBRS=.\.

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+BSC32_FLAGS=/nologo /o"$(OUTDIR)/childbirth_time.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 /machine:I386

+# ADD LINK32 ace-r.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 /machine:I386

+LINK32_FLAGS=ace-r.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:no\

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

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

+LINK32_OBJS= \

+	"$(INTDIR)\childbirth_time.obj"

+

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

+    $(LINK32) @<<

+  $(LINK32_FLAGS) $(LINK32_OBJS)

+<<

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "childbirth_time\Debug"

+# PROP BASE Intermediate_Dir "childbirth_time\Debug"

+# PROP BASE Target_Dir "childbirth_time"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\Debug"

+# PROP Target_Dir "childbirth_time"

+OUTDIR=.\.

+INTDIR=.\Debug

+

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

+

+CLEAN : 

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

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

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

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

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

+	-@erase "$(OUTDIR)\childbirth_time.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)/childbirth_time.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

+CPP_OBJS=.\.\Debug/

+CPP_SBRS=.\.

+# 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)/childbirth_time.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)/childbirth_time.pdb" /debug /machine:I386\

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

+LINK32_OBJS= \

+	"$(INTDIR)\childbirth_time.obj"

+

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

+    $(LINK32) @<<

+  $(LINK32_FLAGS) $(LINK32_OBJS)

+<<

+

 !ENDIF 

 

 .c{$(CPP_OBJS)}.obj:

@@ -559,148 +684,6 @@ LINK32_OBJS= \
 # Begin Source File

 

 SOURCE=.\context_switch_time.cpp

-

-!IF  "$(CFG)" == "context_switch_time - Win32 Release"

-

-DEP_CPP_CONTE=\

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

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

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

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-	{$(INCLUDE)}"\ace\Module.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\Sched_Params.h"\

-	{$(INCLUDE)}"\ace\Sched_Params.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\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\Stream_Modules.cpp"\

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

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

-	{$(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\Task.h"\

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

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

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

-	{$(INCLUDE)}"\ace\Task_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)\context_switch_time.obj" : $(SOURCE) $(DEP_CPP_CONTE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "context_switch_time - Win32 Debug"

-

 DEP_CPP_CONTE=\

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

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

@@ -838,8 +821,6 @@ DEP_CPP_CONTE=\
 "$(INTDIR)\context_switch_time.obj" : $(SOURCE) $(DEP_CPP_CONTE) "$(INTDIR)"

 

 

-!ENDIF 

-

 # End Source File

 # End Target

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

@@ -1100,5 +1081,56 @@ DEP_CPP_TEST_N=\
 

 # End Source File

 # End Target

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

+# Begin Target

+

+# Name "childbirth_time - Win32 Release"

+# Name "childbirth_time - Win32 Debug"

+

+!IF  "$(CFG)" == "childbirth_time - Win32 Release"

+

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

+

+!ENDIF 

+

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

+# Begin Source File

+

+SOURCE=.\childbirth_time.cpp

+DEP_CPP_CHILD=\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+	

+

+"$(INTDIR)\childbirth_time.obj" : $(SOURCE) $(DEP_CPP_CHILD) "$(INTDIR)"

+

+

+# End Source File

+# End Target

 # End Project

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

diff --git a/performance-tests/Misc/misc.mdp b/performance-tests/Misc/misc.mdp
index d840936a889..e8debdc88c8 100644
--- a/performance-tests/Misc/misc.mdp
+++ b/performance-tests/Misc/misc.mdp