ChangeLogTag:Sun Nov 9 04:08:16 UTC 2003 Don Hinton <dhinton@dresystems.com>

25 files changed, 14 insertions, 23 deletions

diff --git a/performance-tests/Misc/test_guard.cpp b/performance-tests/Misc/test_guard.cpp
index bbff5602888..507f22bfff7 100644
--- a/performance-tests/Misc/test_guard.cpp
+++ b/performance-tests/Misc/test_guard.cpp
@@ -6,7 +6,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/Get_Opt.h"
 #include "ace/Profile_Timer.h"
-#include "ace/Synch.h"
 
 #if !defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
 #error You must compile ACE and this program with ACE_USES_OBSOLETE_GUARD_CLASSES defined!
diff --git a/performance-tests/Misc/test_singleton.h b/performance-tests/Misc/test_singleton.h
index dbbfac996e4..70aef65d89b 100644
--- a/performance-tests/Misc/test_singleton.h
+++ b/performance-tests/Misc/test_singleton.h
@@ -7,7 +7,7 @@
 #ifndef __TEST_SINGLETON_H
 #define __TEST_SINGLETON_H
 
-#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
 
 class DC_Singleton
 {
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h
index 5813d4fb972..4664bd3cda8 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h
+++ b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h
@@ -24,7 +24,6 @@
 
 #if defined (ACE_HAS_THREADS)
 
-#include "ace/Synch_T.h"
 #include "ace/Manual_Event.h"
 
 enum DEBUGGING_RANGE
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index 62fb4297507..7c9eb5bd993 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -2,7 +2,6 @@
 
 #define  ACE_BUILD_SVC_DLL
 #include "ace/Service_Repository.h"
-#include "ace/Synch.h"
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
 #include "Baseline_Test.h"
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
index 0bc5ef79bc2..d288dd19982 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
@@ -6,6 +6,7 @@
 
 #include "ace/Profile_Timer.h"
 #include "ace/svc_export.h"
+#include "ace/Barrier.h"
 
 #include "Synch_Lib/Benchmark_Base.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
index 2f82c87f56f..f0b06b3bf06 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
@@ -2,7 +2,6 @@
 
 #define ACE_BUILD_SVC_DLL
 
-#include "ace/Synch.h"
 #include "Baseline_Test.h"
 
 class ACE_Svc_Export Baseline_Base_Test : public Baseline_Test_Base
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
index 57dbd039c18..8dbf11e49e6 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
@@ -2,10 +2,13 @@
 
 #define ACE_BUILD_SVC_DLL
 
-#include "ace/Synch.h"
 #include "ace/Token.h"
 #include "ace/Process_Mutex.h"
 #include "ace/RW_Process_Mutex.h"
+#include "ace/Lock_Adapter_T.h"
+#include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Semaphore.h"
+#include "ace/Null_Semaphore.h"
 #include "Baseline_Test.h"
 
 template<class LOCK>
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp
index 46fed5d4dbb..32ad7ea5431 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Adaptive_Lock_Performance_Test_Base.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
index d013da6aa3f..c54c5f900f3 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.cpp
@@ -2,7 +2,6 @@
 
 #define  ACE_BUILD_SVC_DLL
 #include "ace/Service_Repository.h"
-#include "ace/Synch.h"
 
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
index cd49c3321f5..b2906371869 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
@@ -2,6 +2,7 @@
 
 #define  ACE_BUILD_SVC_DLL
 #include "Performance_Test_Options.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID(Synch_Benchmarks, Performance_Test_Options, "$Id$")
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
index fcbb0078c1f..0381e964f52 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_mutex_test.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Adaptive_Lock_Performance_Test_Base.h"
+#include "ace/Lock_Adapter_T.h"
 
 ACE_RCSID(Synch_Benchmarks, adaptive_mutex_test, "$Id$")
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
index 4eaf4a46af0..a3cb2c2dd69 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_recursive_lock_test.cpp
@@ -1,8 +1,9 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Adaptive_Lock_Performance_Test_Base.h"
+#include "ace/Lock_Adapter_T.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 ACE_RCSID(Synch_Benchmarks, adaptive_recursive_lock_test, "$Id$")
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
index 7f9c9f5886b..5b0c7d4af37 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/adaptive_sema_test.cpp
@@ -1,8 +1,9 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Adaptive_Lock_Performance_Test_Base.h"
+#include "ace/Semaphore.h"
+#include "ace/Lock_Adapter_T.h"
 
 ACE_RCSID(Synch_Benchmarks, adaptive_sema_test, "$Id$")
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
index 62da9a31157..432f741b9e7 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
index e08bbca994a..a930727861b 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
index b49069faea2..fc4fa0dc26d 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
index 8db023236a1..4f325eaf49b 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
index 673a22493ca..5faa976a506 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
index 30bbbbc855d..c1e0a1e0ad0 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
index 14a2c459323..69949272b9d 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
index e0e96f09a52..66b0c6213ca 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
index 09560a855af..d44baf6dd7a 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
index 16c00c06a75..9f1d7657139 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 #define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
 #include "Performance_Test_Options.h"
 #include "Benchmark_Performance.h"
+#include "ace/Semaphore.h"
 
 ACE_RCSID(Synch_Benchmarks, sema_test, "$Id$")
 
diff --git a/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h b/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h
index ef5620c0a94..1737d45b36f 100644
--- a/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h
+++ b/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h
@@ -13,10 +13,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 # include "ace/Service_Repository.h"
-# include "ace/Synch.h"
 # include "ace/Service_Types.h"
 # include "ace/Atomic_Op.h"
 # include "export_mac.h"
+# include "ace/TSS_T.h"
 
 # if defined (ACE_HAS_THREADS)
 
diff --git a/performance-tests/Synch-Benchmarks/synch_driver.cpp b/performance-tests/Synch-Benchmarks/synch_driver.cpp
index e1b7f0fb030..7724b5394d3 100644
--- a/performance-tests/Synch-Benchmarks/synch_driver.cpp
+++ b/performance-tests/Synch-Benchmarks/synch_driver.cpp
@@ -5,7 +5,6 @@
 
 #include "ace/Service_Config.h"
 #include "ace/Service_Repository.h"
-#include "ace/Synch.h"
 #include "Synch_Lib/Benchmark_Base.h"
 
 ACE_RCSID(Synch_Benchmarks, synch_driver, "$Id$")