diff options
Diffstat (limited to 'performance-tests/Synch-Benchmarks/Base_Test')
7 files changed, 0 insertions, 1046 deletions
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp b/performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp deleted file mode 100644 index 0fb037dfd7e..00000000000 --- a/performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp +++ /dev/null @@ -1,115 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Base_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=Base_Test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Base_Test.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Base_Test.mak" CFG="Base_Test - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Base_Test - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Base_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
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Base_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# 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 "..\..\..\\" /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
-# ADD BASE BSC32 /nologo
-# 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 Synch_Lib.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\Synch_Lib"
-
-!ELSEIF "$(CFG)" == "Base_Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# 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 "..\\" /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
-# ADD BASE BSC32 /nologo
-# 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 Synch_Libd.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Base_Testd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\Synch_Lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Base_Test - Win32 Release"
-# Name "Base_Test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ".cpp"
-# Begin Source File
-
-SOURCE=.\base_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Baseline_Test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\mutex_test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ".h"
-# Begin Source File
-
-SOURCE=.\Baseline_Test.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp deleted file mode 100644 index be6e1eaf72f..00000000000 --- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp +++ /dev/null @@ -1,225 +0,0 @@ -// $Id$ - -#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" - -#if !defined (__ACE_INLINE__) -#include "Baseline_Test.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(Synch_Benchmarks, Baseline_Test, "$Id$") - -Baseline_Test_Options baseline_options; -// Static Baseline Options holds the test configuration information -// and the test statistics. - -Baseline_Test_Base::Baseline_Test_Base (void) - : Benchmark_Base (Benchmark_Base::BASELINE), - yield_method_ (Baseline_Test_Options::USE_SLEEP_ZERO), - iteration_ (DEFAULT_ITERATIONS), - what_(TEST_LOCK) -{ -} - -int -Baseline_Test_Base::init (int argc, char *argv[]) -{ - return this->parse_args (argc, argv); -} - -int -Baseline_Test_Base::parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt getopt (argc, argv, "i:ylrw", 0); - int c; - - while ((c = getopt ()) != -1) - switch (c) - { - case 'i': // Total iterations - { - int tmp = ACE_OS::atoi (getopt.optarg); - if (tmp <= 0) - ACE_ERROR_RETURN ((LM_ERROR, - "%d is not a valid value for iteration\n", - tmp), -1); - else - this->iteration_ = ACE_static_cast (size_t, tmp); - } - break; - - case 'y': // Use thr_yield. - this->yield_method_ = Baseline_Test_Options::USE_THR_YIELD; - break; - - case 'l': - this->what_ = TEST_LOCK; - break; - - case 'r': - this->what_ = TEST_READLOCK; - break; - - case 'w': - this->what_ = TEST_WRITELOCK; - break; - - default: - ACE_ERROR ((LM_ERROR, "Invalid argument %c used\n", c)); - break; - } - return 0; -} - -void -Baseline_Test_Base::yield (void) -{ - if (this->yield_method_ == Baseline_Test_Options::USE_SLEEP_ZERO) - ACE_OS::sleep (0); - else - ACE_OS::thr_yield (); -} - -Baseline_Test_Options::Baseline_Test_Options (void) - : test_try_lock_ (0), - verbose_ (0), - current_yield_method_ (0), - current_iteration_ (0), - total_iteration_ (DEFAULT_ITERATIONS) -{ -} - -int -Baseline_Test_Options::parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt getopt (argc, argv, "tv", 0); - int c; - - while ((c = getopt ()) != -1) - switch (c) - { - case 't': - this->test_try_lock_ = 1; - break; - - case 'v': - this->verbose_ = 1; - break; - - default: - ACE_ERROR ((LM_ERROR, "Invalid arguemnt %c used.\n", c)); - break; - } - return 0; -} - -int -Baseline_Test_Options::reset_params (size_t iteration, - int yield) -{ - this->current_iteration_ = 0; - this->timer.reset (); - - this->current_yield_method_ = yield; - this->total_iteration_ = iteration; - return 0; -} - -void -Baseline_Test_Options::print_result (void) -{ - ACE_Time_Value tv; - ACE_hrtime_t nsec; - - this->timer.elapsed_time_incr (tv); - this->timer.elapsed_time_incr (nsec); - ACE_DEBUG ((LM_DEBUG, - "Total Time: %d sec %d usec for a " - "total of %d iterations\n" - "Average time: %d nanoseconds.\n", - tv.sec (), tv.usec (), - this->current_iteration_, - (int) (nsec / this->current_iteration_))); -} - -Baseline_Test::Baseline_Test (void) - : current_test_ (0), - get_lock_ (2), - let_go_lock_ (2) -{ -} - -// Initialize and run the benchmarks tests. - -int -Baseline_Test::init (int argc, char **argv) -{ - return baseline_options.parse_args (argc, argv); -} - -int -Baseline_Test::pre_run_test (Benchmark_Base *bb) -{ - this->current_test_ = (Baseline_Test_Base *) bb; - baseline_options.reset_params (this->current_test_->iteration (), - this->current_test_->yield_method ()); - if (baseline_options.test_try_lock ()) - { - ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (Baseline_Test::hold_lock), - (void *) this); - - this->get_lock_.wait (); - // Wait until the lock is held by the spawning thread. - } - - return 0; -} - -int -Baseline_Test::run_test (void) -{ - if (baseline_options.test_try_lock ()) - return this->current_test_->test_try_lock (); - else - return this->current_test_->test_acquire_release (); -} - -int -Baseline_Test::post_run_test (void) -{ - if (baseline_options.test_try_lock ()) - { - // Release the lock we hold. - this->let_go_lock_.wait (); - - ACE_Thread_Manager::instance ()->wait (); - } - - baseline_options.print_result (); - - return 0; -} - -int -Baseline_Test::valid_test_object (Benchmark_Base *bb) -{ - return (bb->benchmark_type () == Benchmark_Base::BASELINE); -} - -void * -Baseline_Test::hold_lock (void *arg) -{ - Baseline_Test *this_test = (Baseline_Test *) arg; - this_test->current_test_->acquire (); - this_test->get_lock_.wait (); - - this_test->let_go_lock_.wait (); - return 0; -} - -ACE_SVC_FACTORY_DEFINE (Baseline_Test) diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h deleted file mode 100644 index 31ea8a25ffa..00000000000 --- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h +++ /dev/null @@ -1,147 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef ACE_BASELINE_TEST_H -#define ACE_BASELINE_TEST_H - -#include "ace/Profile_Timer.h" - -#include "Synch_Lib/Benchmark_Base.h" - -const unsigned long DEFAULT_ITERATIONS = 1000000; - -class ACE_Svc_Export Baseline_Test_Base : public Benchmark_Base -{ - // = TITLE - // This class identifies itself as Benmarking Performance Test class. -public: - enum { - TEST_LOCK, - TEST_READLOCK, - TEST_WRITELOCK - }; - - virtual int init (int argc, char *argv[]); - // Standard initializing method for Baseline Test. - - int parse_args (int argc, char *argv[]); - // Parsing the svc.conf file arguments. - - virtual int acquire () = 0; - virtual int release () = 0; - // These two method are used to test try_acquire performance. - - virtual int test_acquire_release () = 0; - virtual int test_try_lock () = 0; - // Real test methods. - - virtual int yield_method (); - // Query the yield method used. - - virtual void yield (); - // Yield to other thread. - - size_t iteration (void); - // Access methods. - -protected: - Baseline_Test_Base (void); - - int yield_method_; - // Should we your thr_yield or sleep (0). - - size_t iteration_; - // Total number of operations. <iterations_> - - int what_; - // What test should be performed? -}; - -class ACE_Svc_Export Baseline_Test_Options -{ - // = TITLE - // This class holds the global settings for Baseline Test. -public: - friend class Baseline_Test; - - enum - { - USE_SLEEP_ZERO, - USE_THR_YIELD - }; - - Baseline_Test_Options (void); - // ctor. - - int parse_args (int argc, char *argv[]); - // Parse and set the Baseline_Test options and flags. - - int reset_params (size_t iteration, int yield); - // Reset test parameters for next round. - - int test_try_lock (void); - // Return test configuration. - - void start_inc_timer (void); - void stop_inc_timer (void); - // Start/stop measuring time. - - int inc_loop_counter (void); - // Returns - - size_t current_iteration (void); - // Return <iteration_>. - - void print_result (void); - // Print out the result. - -private: - int test_try_lock_; - // A flag indicates whether we are testing try_lock or lock and - // release. - - int verbose_; - // Print out the result in verbose mode. - - int current_yield_method_; - // yield or sleep. - - size_t current_iteration_; - // Number of iteration. - - size_t total_iteration_; - // Total number of target iteration. - - ACE_High_Res_Timer timer; - // Profile timer result. -}; - -extern Baseline_Test_Options baseline_options; - -class ACE_Svc_Export Baseline_Test : public Benchmark_Method_Base -{ -public: - Baseline_Test (void); - virtual int init (int argc, char *argv[]); - virtual int pre_run_test (Benchmark_Base *bp); - virtual int run_test (void); - virtual int post_run_test (void); - virtual int valid_test_object (Benchmark_Base *); - - static void *hold_lock (void * arg); - // This method runs in a separate thread, and is used to hold the lock while - // we test the performance of try lock. - -private: - Baseline_Test_Base *current_test_; - ACE_Barrier get_lock_; - ACE_Barrier let_go_lock_; -}; - -ACE_SVC_FACTORY_DECLARE (Baseline_Test) - -#if defined (__ACE_INLINE__) -#include "Baseline_Test.i" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_BASELINE_TEST_H */ diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i deleted file mode 100644 index 05aa007478d..00000000000 --- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i +++ /dev/null @@ -1,43 +0,0 @@ -// $Id$ - -ACE_INLINE size_t -Baseline_Test_Base::iteration (void) -{ - return this->iteration_; -} - -ACE_INLINE int -Baseline_Test_Base::yield_method (void) -{ - return this->yield_method_; -} - -ACE_INLINE int -Baseline_Test_Options::test_try_lock (void) -{ - return this->test_try_lock_; -} - -ACE_INLINE size_t -Baseline_Test_Options::current_iteration (void) -{ - return this->current_iteration_; -} - -ACE_INLINE void -Baseline_Test_Options::start_inc_timer (void) -{ - this->timer.start_incr (); -} - -ACE_INLINE void -Baseline_Test_Options::stop_inc_timer (void) -{ - this->timer.stop_incr (); -} - -ACE_INLINE int -Baseline_Test_Options::inc_loop_counter (void) -{ - return (++this->current_iteration_ < this->total_iteration_); -} diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Makefile b/performance-tests/Synch-Benchmarks/Base_Test/Makefile deleted file mode 100644 index f7d3982d86d..00000000000 --- a/performance-tests/Synch-Benchmarks/Base_Test/Makefile +++ /dev/null @@ -1,227 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the Solaris 2.x synchronization benchmarks -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -CPPFLAGS += -I.. -LIB = libBase_Test.a -SHLIB = libBase_Test.$(SOEXT) - -FILES = Baseline_Test \ - mutex_test \ - base_test - -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) - -LDLIBS = -lSynch_Lib - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - -BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/Baseline_Test.o .obj/Baseline_Test.so .shobj/Baseline_Test.o .shobj/Baseline_Test.so: Baseline_Test.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Thread_Manager.i Baseline_Test.h \ - $(ACE_ROOT)/ace/Profile_Timer.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i \ - ../Synch_Lib/Benchmark_Base.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - ../Synch_Lib/export_mac.h Baseline_Test.i -.obj/mutex_test.o .obj/mutex_test.so .shobj/mutex_test.o .shobj/mutex_test.so: mutex_test.cpp $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-linux-lxpthreads.h \ - $(ACE_ROOT)/ace/config-linux-common.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp Baseline_Test.h \ - $(ACE_ROOT)/ace/Profile_Timer.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i \ - ../Synch_Lib/Benchmark_Base.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - ../Synch_Lib/export_mac.h Baseline_Test.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp deleted file mode 100644 index 2f82c87f56f..00000000000 --- a/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "ace/Synch.h" -#include "Baseline_Test.h" - -class ACE_Svc_Export Baseline_Base_Test : public Baseline_Test_Base -{ -public: - virtual int acquire (); - virtual int release (); - // These two method are used to test try_acquire performance. - - virtual int test_acquire_release (); - virtual int test_try_lock (); - // Real test methods. -}; - -int -Baseline_Base_Test::acquire () -{ - return 0; -} - -int -Baseline_Base_Test::release () -{ - return 0; -} - -int -Baseline_Base_Test::test_acquire_release () -{ - baseline_options.start_inc_timer (); - - for (; baseline_options.inc_loop_counter () ; ) - ; - - baseline_options.stop_inc_timer (); - return 0; -} - -int -Baseline_Base_Test::test_try_lock () -{ - baseline_options.start_inc_timer (); - - for (; baseline_options.inc_loop_counter () ; ) - ; - - baseline_options.stop_inc_timer (); - return 0; -} - -ACE_SVC_FACTORY_DECLARE (Baseline_Base_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Base_Test) diff --git a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp deleted file mode 100644 index b8c5c581270..00000000000 --- a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp +++ /dev/null @@ -1,232 +0,0 @@ -// $Id$ - -#define ACE_BUILD_SVC_DLL - -#include "ace/Synch.h" -#include "ace/Token.h" -#include "Baseline_Test.h" - -template<class LOCK> -class ACE_Svc_Export Baseline_Lock_Test : public Baseline_Test_Base -{ -public: - virtual int acquire (); - virtual int release (); - // These two method are used to test try_acquire performance. - - virtual int test_acquire_release (); - virtual int test_try_lock (); - // Real test methods. - -private: - LOCK lock_; - // -}; - -template<class LOCK> int -Baseline_Lock_Test<LOCK>::acquire () -{ - int retv = 0; - switch (this->what_) - { - case TEST_READLOCK: - retv = this->lock_.acquire_read (); - break; - case TEST_WRITELOCK: - retv = this->lock_.acquire_write (); - break; - case TEST_LOCK: - default: - retv = this->lock_.acquire (); - break; - } - - return retv; -} - -template<class LOCK> int -Baseline_Lock_Test<LOCK>::release () -{ - return this->lock_.release (); -} - -template<class LOCK> int -Baseline_Lock_Test<LOCK>::test_acquire_release () -{ - baseline_options.start_inc_timer (); - - switch (this->what_) - { - case TEST_READLOCK: - for (; baseline_options.inc_loop_counter () ; ) - { - this->lock_.acquire_read (); - this->lock_.release (); - } - break; - case TEST_WRITELOCK: - for (; baseline_options.inc_loop_counter () ; ) - { - this->lock_.acquire_write (); - this->lock_.release (); - } - break; - case TEST_LOCK: - default: - for (; baseline_options.inc_loop_counter () ; ) - { - this->lock_.acquire (); - this->lock_.release (); - } - break; - } - - baseline_options.stop_inc_timer (); - - return 0; -} - -template<class LOCK> int -Baseline_Lock_Test<LOCK>::test_try_lock () -{ - baseline_options.start_inc_timer (); - switch (this->what_) - { - case TEST_READLOCK: - for (; baseline_options.inc_loop_counter () ; ) - this->lock_.tryacquire_read (); // This should always fail. - break; - case TEST_WRITELOCK: - for (; baseline_options.inc_loop_counter () ; ) - this->lock_.tryacquire_write (); // This should always fail. - break; - case TEST_LOCK: - default: - for (; baseline_options.inc_loop_counter () ; ) - this->lock_.tryacquire (); // This should always fail. - break; - } - - for (; baseline_options.inc_loop_counter () ; ) - this->lock_.tryacquire (); // This should always fail. - - baseline_options.stop_inc_timer (); - 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_RW_Thread_Mutex> Baseline_RW_Thread_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_RW_Thread_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_RW_Thread_Mutex_Test) - -typedef Baseline_Lock_Test<ACE_RW_Mutex> Baseline_RW_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_RW_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_RW_Mutex_Test) - -typedef Baseline_Lock_Test<ACE_Process_Mutex> Baseline_Process_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Process_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Process_Mutex_Test) - -typedef Baseline_Lock_Test<ACE_RW_Process_Mutex> Baseline_RW_Process_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_RW_Process_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_RW_Process_Mutex_Test) - -typedef Baseline_Lock_Test<ACE_Null_Mutex> Baseline_Null_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Null_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Null_Mutex_Test) - -typedef Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Null_Mutex> > Baseline_Adaptive_Null_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Adaptive_Null_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Adaptive_Null_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) - -typedef Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Thread_Mutex> > Baseline_Adaptive_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Adaptive_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Adaptive_Mutex_Test) - -typedef Baseline_Lock_Test< ACE_Lock_Adapter<ACE_RW_Mutex> > Baseline_Adaptive_RW_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Adaptive_RW_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Adaptive_RW_Mutex_Test) - -typedef Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> > Baseline_Adaptive_Recursive_Mutex_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Adaptive_Recursive_Mutex_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Adaptive_Recursive_Mutex_Test) - -typedef Baseline_Lock_Test<ACE_Semaphore> Baseline_Semaphore_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Semaphore_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Semaphore_Test) - -typedef Baseline_Lock_Test<ACE_Semaphore> Baseline_Process_Semaphore_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Process_Semaphore_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Process_Semaphore_Test) - -typedef Baseline_Lock_Test<ACE_Null_Semaphore> Baseline_Null_Semaphore_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Null_Semaphore_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Null_Semaphore_Test) - -typedef Baseline_Lock_Test<ACE_Token> Baseline_Token_Test; - -ACE_SVC_FACTORY_DECLARE (Baseline_Token_Test) -ACE_SVC_FACTORY_DEFINE (Baseline_Token_Test) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Baseline_Lock_Test<ACE_Thread_Mutex>; -template class Baseline_Lock_Test<ACE_Process_Mutex>; -template class Baseline_Lock_Test<ACE_RW_Process_Mutex>; -template class Baseline_Lock_Test<ACE_RW_Mutex>; -template class Baseline_Lock_Test<ACE_RW_Thread_Mutex>; -template class Baseline_Lock_Test<ACE_Null_Mutex>; -template class ACE_Lock_Adapter<ACE_Null_Mutex>; -template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Null_Mutex> >; -template class Baseline_Lock_Test<ACE_Recursive_Thread_Mutex>; -template class ACE_Lock_Adapter<ACE_Thread_Mutex>; -template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Thread_Mutex> >; -template class ACE_Lock_Adapter<ACE_RW_Mutex>; -template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_RW_Mutex> >; -template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>; -template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> >; -template class Baseline_Lock_Test<ACE_Semaphore>; -template class Baseline_Lock_Test<ACE_Process_Semaphore>; -template class Baseline_Lock_Test<ACE_Null_Semaphore>; -template class Baseline_Lock_Test<ACE_Token>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Baseline_Lock_Test<ACE_Thread_Mutex> -#pragma instantiate Baseline_Lock_Test<ACE_Process_Mutex> -#pragma instantiate Baseline_Lock_Test<ACE_RW_Process_Mutex> -#pragma instantiate Baseline_Lock_Test<ACE_RW_Mutex> -#pragma instantiate Baseline_Lock_Test<ACE_RW_Thread_Mutex> -#pragma instantiate Baseline_Lock_Test<ACE_Null_Mutex> -#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex> -#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Null_Mutex> > -#pragma instantiate Baseline_Lock_Test<ACE_Recursive_Thread_Mutex> -#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex> -#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Thread_Mutex> > -#pragma instantiate ACE_Lock_Adapter<ACE_RW_Mutex> -#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_RW_Mutex> > -#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> -#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> > -#pragma instantiate Baseline_Lock_Test<ACE_Semaphore> -#pragma instantiate Baseline_Lock_Test<ACE_Process_Semaphore> -#pragma instantiate Baseline_Lock_Test<ACE_Null_Semaphore> -#pragma instantiate Baseline_Lock_Test<ACE_Token> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |