diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-30 10:47:05 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-30 10:47:05 +0000 |
| commit | 2a5a195b5826c4ed2c6cb1636e4c78c634b4219f (patch) | |
| tree | 1f845e1609c2abbfda6b4736f321e8f6ff67919c /tests | |
| parent | b8644c0563e107d57a57896a1561dc2df965c55d (diff) | |
| download | ATCD-2a5a195b5826c4ed2c6cb1636e4c78c634b4219f.tar.gz | |
ChangeLogTag:Thu May 30 10:18:27 UTC 2002 Don Hinton <dhinton@ieee.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Framework_Component_DLL.cpp | 4 | ||||
| -rw-r--r-- | tests/Framework_Component_Test.cpp | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/tests/Framework_Component_DLL.cpp b/tests/Framework_Component_DLL.cpp index 533b9dbea05..c658c02b9e8 100644 --- a/tests/Framework_Component_DLL.cpp +++ b/tests/Framework_Component_DLL.cpp @@ -7,6 +7,8 @@ ACE_RCSID (tests, Framework_Component_DLL, "$Id$") +ACE_DLL_UNLOAD_POLICY (Framework_Component_DLL, ACE_DLL_UNLOAD_POLICY_LAZY) + Simple_Service::Simple_Service (void) { FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::Simple_Service"); @@ -41,7 +43,7 @@ public: FWCT_DLL_Singleton_Adapter_T <Simple_Service> *ss = SS_SINGLETON::instance (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Server_T::init() dll_name: %s\n"), + ACE_TEXT ("Server_T::init() dll_name: %s\n"), ss->dll_name ())); return 0; } diff --git a/tests/Framework_Component_Test.cpp b/tests/Framework_Component_Test.cpp index 0f452176b69..61d8ca77f7d 100644 --- a/tests/Framework_Component_Test.cpp +++ b/tests/Framework_Component_Test.cpp @@ -46,7 +46,8 @@ ACE_RCSID(tests, Framework_Component_Test, "$Id$") ACE_TEXT ("path='Framework_Component_DLL' params=''/> </dynamic>") # define REMOVE_SERVICE(X) \ - ACE_TEXT ( "<?xml version='1.0'?> <remove id='Server_") ACE_TEXT(#X) ACE_TEXT("'> </remove>") + ACE_TEXT ( "<?xml version='1.0'?> <remove id='Server_") ACE_TEXT(#X) \ + ACE_TEXT("'> </remove>") #endif /* ACE_USES_CLASSIC_SVC_CONF */ @@ -54,12 +55,12 @@ int run_test (u_long unload_mask = 0) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running test with mask = %s|%s\n"), - ACE_BIT_ENABLED(unload_mask, ACE_DLL_Manager_Ex::PER_DLL) == 0 + ACE_BIT_ENABLED(unload_mask, ACE_DLL_UNLOAD_POLICY_PER_DLL) == 0 ? ACE_TEXT ("PER_PROCESS") : ACE_TEXT ("PER_DLL"), - ACE_BIT_ENABLED(unload_mask, ACE_DLL_Manager_Ex::LAZY) == 0 + ACE_BIT_ENABLED(unload_mask, ACE_DLL_UNLOAD_POLICY_LAZY) == 0 ? ACE_TEXT ("EAGER") : ACE_TEXT ("LAZY"))); - ACE_DLL_Manager::instance ()->unload_strategy (unload_mask); + ACE_DLL_Manager::instance ()->unload_policy (unload_mask); // Now, let the ACE Service Configurator framework load our service from a // dll, which contains a singleton. @@ -90,7 +91,7 @@ run_test (u_long unload_mask = 0) ACE_Service_Config::process_directive (REMOVE_SERVICE(2)); // Force unloading so we'll be ready for the next test. - ACE_DLL_Manager::instance ()->unload_strategy (ACE_DLL_Manager_Ex::DEFAULT); + ACE_DLL_Manager::instance ()->unload_policy (ACE_DLL_UNLOAD_POLICY_DEFAULT); ACE_Service_Config::close (); return 0; @@ -104,16 +105,16 @@ ACE_TMAIN (int, ACE_TCHAR *[]) int retval = 0; // Use defaults, i.e., per process, eager unloading. - retval += run_test (); + retval += run_test (ACE_DLL_UNLOAD_POLICY_DEFAULT); // Per process, lazy unloading - retval += run_test (ACE_DLL_Manager_Ex::LAZY); + retval += run_test (ACE_DLL_UNLOAD_POLICY_LAZY); // Per dll, eager unloading - retval += run_test (ACE_DLL_Manager_Ex::PER_DLL); + retval += run_test (ACE_DLL_UNLOAD_POLICY_PER_DLL); // Per dll, lazy unloading. - retval += run_test (ACE_DLL_Manager_Ex::PER_DLL | ACE_DLL_Manager_Ex::LAZY); + retval += run_test (ACE_DLL_UNLOAD_POLICY_PER_DLL | ACE_DLL_UNLOAD_POLICY_LAZY); ACE_END_TEST; return retval == 0 ? 0 : -1; |