*** empty log message ***

7 files changed, 45 insertions, 51 deletions

diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h b/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
index 44951835f40..364c9f7d432 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
@@ -6,7 +6,7 @@
 #ifndef ACE_BENCHMARK_PERFORMANCE_H
 #define ACE_BENCHMARK_PERFORMANCE_H
 
-#include "../Benchmark_Base.h"
+#include "Synch_Lib/Benchmark_Base.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Perf_Test.dsp b/performance-tests/Synch-Benchmarks/Perf_Test/Perf_Test.dsp
index f2206f1ab7d..b99ba461e23 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Perf_Test.dsp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Perf_Test.dsp
@@ -17,13 +17,12 @@ CFG=Perf_Test - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Perf_Test - Win32 Release" (based on\

- "Win32 (x86) Dynamic-Link Library")

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

- "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Perf_Test - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Perf_Test - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -44,9 +43,9 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\Synch_Lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

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

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

 BSC32=bscmake.exe

@@ -54,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib  Synch_Lib.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\Synch_Lib"

 

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

 

@@ -70,9 +69,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\Synch_Lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

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

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

 BSC32=bscmake.exe

@@ -80,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Perf_Testd.dll" /pdbtype:sept /libpath:"..\..\..\ace"

+# ADD LINK32 aced.lib Synch_Libd.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Perf_Testd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\Synch_Lib"

 

 !ENDIF 

 

@@ -109,10 +108,6 @@ SOURCE=.\adaptive_sema_test.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=..\Benchmark_Base.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Benchmark_Performance.cpp

 # End Source File

 # Begin Source File

diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
index 18eab50afed..27c60d8cc9c 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
@@ -4,7 +4,7 @@
 #ifndef ACE_PERFORMANCE_TEST_H
 #define ACE_PERFORMANCE_TEST_H
 
-#include "../Benchmark_Base.h"
+#include "Synch_Lib/Benchmark_Base.h"
 
 class ACE_Svc_Export Performance_Test : public Benchmark_Method_Base
 {
diff --git a/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp b/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp
index d2bb6f71fc7..6cdde69f338 100644
--- a/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp
+++ b/performance-tests/Synch-Benchmarks/Synch_Lib/Synch_Lib.dsp
@@ -17,13 +17,12 @@ CFG=Synch_Lib - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Synch_Lib - Win32 Release" (based on\

- "Win32 (x86) Dynamic-Link Library")

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

- "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Synch_Lib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Synch_Lib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -41,11 +40,12 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

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

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

 BSC32=bscmake.exe

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\bin\Synch_Lib.dll" /libpath:"..\..\..\ace"

 

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

 

@@ -70,8 +70,8 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

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

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

 BSC32=bscmake.exe

@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:".\Synch_Lib.dll" /pdbtype:sept /libpath:"..\..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\bin\Synch_Libd.dll" /pdbtype:sept /libpath:"..\..\..\ace"

 

 !ENDIF 

 

diff --git a/performance-tests/Synch-Benchmarks/svc.conf b/performance-tests/Synch-Benchmarks/svc.conf
index 424341df1c8..144763e0f29 100644
--- a/performance-tests/Synch-Benchmarks/svc.conf
+++ b/performance-tests/Synch-Benchmarks/svc.conf
@@ -1,18 +1,18 @@
 # Dynamically configure all the tests
-dynamic Performance_Test Service_Object * Perf_Test/Perf_Tests:_make_Performance_Test() "-v -s 3"
-dynamic Mutex_Test Service_Object * Perf_Test/Perf_Tests:_make_Mutex_Test()
-dynamic Adaptive_Mutex_Test Service_Object * Perf_Test/Perf_Tests:_make_Adaptive_Mutex_Test()
-#dynamic Recursive_Lock_Test Service_Object * Perf_Test/Perf_Tests:_make_Recursive_Lock_Test()
-#dynamic Adaptive_Recursive_Lock_Test Service_Object * Perf_Test/Perf_Tests:_make_Adaptive_Recursive_Lock_Test()
-#dynamic Semaphore_Test Service_Object * Perf_Test/Perf_Tests:_make_Sema_Test()
-#dynamic Adaptive_Semaphore_Test Service_Object * Perf_Test/Perf_Tests:_make_Adaptive_Sema_Test()
-#dynamic RWRD_Mutex_Test Service_Object * Perf_Test/Perf_Tests:_make_RWRD_Test()
-#dynamic RWWR_Mutex_Test Service_Object * Perf_Test/Perf_Tests:_make_RWWR_Test()
-#dynamic SYSVSema_Test Service_Object * Perf_Test/Perf_Tests:_make_SYSVSema_Test()
-#dynamic Context_Test Service_Object * Perf_Test/Perf_Tests:_make_Context_Test()
-# dynamic Memory_Test Service_Object  * Perf_Test/Perf_Tests:_make_Memory_Test()
-# dynamic Pipe_Thr_Test Service_Object * Perf_Test/Perf_Tests:_make_Pipe_Thr_Test()
-# dynamic Pipe_Proc_Test Service_Object * Perf_Test/Perf_Tests:_make_Pipe_Proc_Test()
+dynamic Performance_Test Service_Object * Perf_Test/Perf_Test:_make_Performance_Test() "-v -s 3"
+dynamic Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_Mutex_Test()
+dynamic Adaptive_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
+#dynamic Recursive_Lock_Test Service_Object * Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
+#dynamic Adaptive_Recursive_Lock_Test Service_Object * Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
+#dynamic Semaphore_Test Service_Object * Perf_Test/Perf_Test:_make_Sema_Test()
+#dynamic Adaptive_Semaphore_Test Service_Object * Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
+#dynamic RWRD_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_RWRD_Test()
+#dynamic RWWR_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_RWWR_Test()
+#dynamic SYSVSema_Test Service_Object * Perf_Test/Perf_Test:_make_SYSVSema_Test()
+#dynamic Context_Test Service_Object * Perf_Test/Perf_Test:_make_Context_Test()
+# dynamic Memory_Test Service_Object  * Perf_Test/Perf_Test:_make_Memory_Test()
+# dynamic Pipe_Thr_Test Service_Object * Perf_Test/Perf_Test:_make_Pipe_Thr_Test()
+# dynamic Pipe_Proc_Test Service_Object * Perf_Test/Perf_Test:_make_Pipe_Proc_Test()
 # The following two tests don't work correctly yet...
-# dynamic Condition_Broadcast_Test Service_Object * Perf_Test/Perf_Tests:_make_Cond_Brdcast_Test()
-# dynamic Condition_Signal_Test Service_Object * Perf_Test/Perf_Tests:_make_Cond_Signal_Test()
+# dynamic Condition_Broadcast_Test Service_Object * Perf_Test/Perf_Test:_make_Cond_Brdcast_Test()
+# dynamic Condition_Signal_Test Service_Object * Perf_Test/Perf_Test:_make_Cond_Signal_Test()
diff --git a/performance-tests/Synch-Benchmarks/synch_driver.cpp b/performance-tests/Synch-Benchmarks/synch_driver.cpp
index ae01e7f08da..e1b7f0fb030 100644
--- a/performance-tests/Synch-Benchmarks/synch_driver.cpp
+++ b/performance-tests/Synch-Benchmarks/synch_driver.cpp
@@ -6,7 +6,7 @@
 #include "ace/Service_Config.h"
 #include "ace/Service_Repository.h"
 #include "ace/Synch.h"
-#include "Benchmark_Base.h"
+#include "Synch_Lib/Benchmark_Base.h"
 
 ACE_RCSID(Synch_Benchmarks, synch_driver, "$Id$")
 
diff --git a/performance-tests/Synch-Benchmarks/synch_driver.dsp b/performance-tests/Synch-Benchmarks/synch_driver.dsp
index 1c18d3ba6e5..4300bfaaf4e 100644
--- a/performance-tests/Synch-Benchmarks/synch_driver.dsp
+++ b/performance-tests/Synch-Benchmarks/synch_driver.dsp
@@ -17,13 +17,12 @@ CFG=synch_driver - Win32 Release
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "synch_driver - Win32 Release" (based on\

- "Win32 (x86) Console Application")

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

- "Win32 (x86) Console Application")

+!MESSAGE "synch_driver - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "synch_driver - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -51,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 ace.lib Synch_Lib.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"Synch_Lib"

 

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

 

@@ -75,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aced.lib Synch_Libd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace" /libpath:"Synch_Lib"

 

 !ENDIF