*** empty log message ***

3 files changed, 26 insertions, 15 deletions

diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index 39628aa78c9..1f20792fa5a 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -138,7 +138,11 @@ Baseline_Test_Options::reset_params (size_t multiply,
 void
 Baseline_Test_Options::print_result (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "Baseline_Test_Options::print_result (void)\n"));
+  ACE_DEBUG ((LM_DEBUG,
+              "Real Time: %f\n System Time: %f\nUser Time: %f\n",
+              this->real_,
+              this->system_,
+              this->user_));
 }
 
 Baseline_Test::Baseline_Test (void)
@@ -174,8 +178,6 @@ Baseline_Test::pre_run_test (Benchmark_Base *bb)
       // Wait until the lock is held by the spawning thread.
     }
 
-  ACE_DEBUG ((LM_DEBUG, "Pre_run_test\n"));
-
   return 0;
 }
 
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
index 80ba1ee473b..8d9ebc66a2c 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
@@ -5,7 +5,8 @@
 #include "ace/Synch.h"
 #include "Baseline_Test.h"
 
-class ACE_Svc_Export Baseline_Mutex_Test : public Baseline_Test_Base
+template<class LOCK>
+class ACE_Svc_Export Baseline_Lock_Test : public Baseline_Test_Base
 {
 public:
   virtual int acquire ();
@@ -17,25 +18,24 @@ public:
   // Real test methods.
 
 private:
-  ACE_Thread_Mutex lock_;
+  LOCK lock_;
   //
 };
-ACE_SVC_FACTORY_DECLARE (Baseline_Mutex_Test)
 
-int
-Baseline_Mutex_Test::acquire ()
+template<class LOCK> int
+Baseline_Lock_Test<LOCK>::acquire ()
 {
   return this->lock_.acquire ();
 }
 
-int
-Baseline_Mutex_Test::release ()
+template<class LOCK> int
+Baseline_Lock_Test<LOCK>::release ()
 {
   return this->lock_.release ();
 }
 
-int
-Baseline_Mutex_Test::test_acquire_release ()
+template<class LOCK> int
+Baseline_Lock_Test<LOCK>::test_acquire_release ()
 {
   ACE_Profile_Timer ptimer;
   ACE_Profile_Timer::ACE_Elapsed_Time et;
@@ -58,8 +58,8 @@ Baseline_Mutex_Test::test_acquire_release ()
   return 0;
 }
 
-int
-Baseline_Mutex_Test::test_try_lock ()
+template<class LOCK> int
+Baseline_Lock_Test<LOCK>::test_try_lock ()
 {
   ACE_Profile_Timer ptimer;
   ACE_Profile_Timer::ACE_Elapsed_Time et;
@@ -79,4 +79,12 @@ Baseline_Mutex_Test::test_try_lock ()
   return 0;
 }
 
+typedef Baseline_Lock_Test<ACE_Thread_Mutex> Baseline_Mutex_Test;
+
+ACE_SVC_FACTORY_DECLARE (Baseline_Mutex_Test)
 ACE_SVC_FACTORY_DEFINE (Baseline_Mutex_Test)
+
+typedef Baseline_Lock_Test<ACE_Recursive_Thread_Mutex> Baseline_Recursive_Mutex_Test;
+
+ACE_SVC_FACTORY_DECLARE (Baseline_Recursive_Mutex_Test)
+ACE_SVC_FACTORY_DEFINE (Baseline_Recursive_Mutex_Test)
diff --git a/performance-tests/Synch-Benchmarks/svc.conf b/performance-tests/Synch-Benchmarks/svc.conf
index 51c39f6f1a5..9a98cc4b958 100644
--- a/performance-tests/Synch-Benchmarks/svc.conf
+++ b/performance-tests/Synch-Benchmarks/svc.conf
@@ -1,7 +1,8 @@
 # Dynamically configure all the tests
 
 dynamic Baseline_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Test() ""
-dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-i 30000"
+dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-m 300 -i 300000"
+dynamic Baseline_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Recursive_Mutex_Test() "-m 8000 -i 3000000"
 
 
 #dynamic Performance_Test Service_Object * Perf_Test/Perf_Test:_make_Performance_Test() "-s 3"