diff options
Diffstat (limited to 'ACE/ace/Service_Gestalt.cpp')
| -rw-r--r-- | ACE/ace/Service_Gestalt.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index bd80fefc177..a7b9cea1c01 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -58,7 +58,7 @@ ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard #endif { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) STDG::<ctor>, repo=%@") ACE_TEXT(", name=%s - begining at [%d]\n"), &this->repo_, @@ -84,7 +84,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) if ((ret < 0 && ret != -2) || tmp == 0) { if (ACE::debug ()) - ACE_ERROR ((LM_WARNING, + ACELIB_ERROR ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) STDG::<dtor> - Failed (%d) to find %s -> %@\n"), ret, this->name_, tmp)); return; @@ -96,7 +96,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) // the same name as our dummy. if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@ [%d], ") ACE_TEXT ("name=%s - updating dependents [%d - %d)\n"), &this->repo_, @@ -112,7 +112,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) this->repo_.relocate_i (this->repo_begin_, this->repo_.current_size (), tmp->dll()); if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@ [%d], ") ACE_TEXT ("name=%s - loaded (type=%@, impl=%@, object=%@, active=%d)\n"), &this->repo_, @@ -179,7 +179,7 @@ ACE_Service_Gestalt::~ACE_Service_Gestalt (void) // Delete the dynamically allocated static_svcs instance. #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::~SG - this=%@, pss = %@\n"), this, this->processed_static_svcs_)); #endif @@ -225,7 +225,7 @@ ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size, #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::ctor - this = %@, pss = %@\n"), this, this->processed_static_svcs_)); #endif @@ -381,7 +381,7 @@ ACE_Service_Gestalt::add_processed_static_svc this->processed_static_svcs_->insert(tmp); if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::add_processed_static_svc, ") ACE_TEXT ("repo=%@ - %s\n"), this->repo_, @@ -427,7 +427,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, #ifndef ACE_NLOGGING if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::initialize - () repo=%@, ") ACE_TEXT ("looking up static ") ACE_TEXT ("service \'%s\' to initialize\n"), @@ -448,7 +448,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, } else { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'") ACE_TEXT (" was not located.\n"), svc_name), @@ -456,7 +456,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, } } if (srp == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'") ACE_TEXT (" was not located.\n"), svc_name), @@ -467,7 +467,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, args.argv ()) == -1) { // ... report and remove this entry. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - static init of \'%s\'") ACE_TEXT (" failed (%p)\n"), svc_name, ACE_TEXT ("error"))); @@ -490,7 +490,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s") ACE_TEXT (" - looking up in the repo\n"), this->repo_, @@ -507,7 +507,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, { #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_WARNING, + ACELIB_DEBUG ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,") ACE_TEXT (" name=%s - removing a pre-existing namesake.\n"), this->repo_, @@ -527,7 +527,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, // DLL_Manager was re-entrant we would have entered an infinite // recursion here. if (retv == -2 && srp->type () == 0) - ACE_ERROR_RETURN ((LM_WARNING, + ACELIB_ERROR_RETURN ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,") ACE_TEXT (" name=%s - forward-declared; ") ACE_TEXT (" recursive initialization requests are") @@ -583,7 +583,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr, ACE_TRACE ("ACE_Service_Gestalt::initialize"); if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s") ACE_TEXT (" - looking up in the repo\n"), this->repo_, @@ -594,7 +594,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr, (const ACE_Service_Type **) &srp) >= 0) { #ifndef ACE_NLOGGING - ACE_DEBUG ((LM_WARNING, + ACELIB_DEBUG ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s") ACE_TEXT (" - removing a pre-existing namesake.\n"), this->repo_, @@ -625,7 +625,7 @@ ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr, #ifndef ACE_NLOGGING // Not using LM_ERROR here to avoid confusing the test harness if (ACE::debug ()) - ACE_ERROR_RETURN ((LM_WARNING, + ACELIB_ERROR_RETURN ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize_i -") ACE_TEXT (" repo=%@, name=%s - remove failed: %m\n"), this->repo_, @@ -640,7 +640,7 @@ ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr, #ifndef ACE_NLOGGING // Not using LM_ERROR here to avoid confusing the test harness if (ACE::debug ()) - ACE_ERROR_RETURN ((LM_WARNING, + ACELIB_ERROR_RETURN ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize_i -") ACE_TEXT (" repo=%@, name=%s - insert failed: %m\n"), this->repo_, @@ -753,7 +753,7 @@ ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd, #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::process_directive_i, ") ACE_TEXT ("repo=%@ - %s, dll=%s, force=%d\n"), this->repo_, @@ -772,7 +772,7 @@ ACE_Service_Gestalt::process_directives_i (ACE_Svc_Conf_Param *param) { #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::process_directives_i, ") ACE_TEXT ("repo=%@ - %s\n"), this->repo_, @@ -818,7 +818,7 @@ ACE_XML_Svc_Conf * ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) { if (xmldll.open (ACE_TEXT ("ACEXML_XML_Svc_Conf_Parser")) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) Failure to open ACEXML_XML_Svc_Conf_Parser: %p\n"), ACE_TEXT("ACE_Service_Config::get_xml_svc_conf")), 0); @@ -835,7 +835,7 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) ACE_XML_Svc_Conf::Factory factory = reinterpret_cast<ACE_XML_Svc_Conf::Factory> (temp_p); if (factory == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) Unable to resolve factory: %p\n"), xmldll.error ()), 0); @@ -856,7 +856,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[]) // service with a matching name. if (this->repo_->find (file, 0, 0) >=0) { - ACE_DEBUG ((LM_WARNING, + ACELIB_DEBUG ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) Configuration file %s is currently") ACE_TEXT (" being processed. Ignoring recursive process_file().\n"), file)); @@ -882,7 +882,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[]) // Invalid svc.conf file. We'll report it here and break out of // the method. if (ACE::debug ()) - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("ACE (%P|%t): %p\n"), file)); @@ -926,7 +926,7 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[]) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::process_directive, repo=%@ - %s\n"), this->repo_, directive)); @@ -975,7 +975,7 @@ ACE_Service_Gestalt::init_svc_conf_file_queue (void) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::init_svc_conf_file_queue ") ACE_TEXT ("- this=%@, repo=%@\n"), this, this->repo_)); @@ -1008,7 +1008,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::open_i - this=%@, ") ACE_TEXT ("opened=%d, loadstatics=%d\n"), this, this->is_opened_, this->no_static_svcs_)); @@ -1095,7 +1095,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], (ACE_TString (ACE_DEFAULT_SVC_CONF)) == -1) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("enqueuing ") ACE_DEFAULT_SVC_CONF @@ -1157,7 +1157,7 @@ ACE_Service_Gestalt::process_commandline_directives (void) // Process just a single directive. if (this->process_directive ((sptr->fast_rep ())) != 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) %p\n"), ACE_TEXT ("process_directive"))); result = -1; @@ -1203,7 +1203,7 @@ ACE_Service_Gestalt::parse_args_i (int argc, break; case 'f': if (this->svc_conf_file_queue_->enqueue_tail (ACE_TString (get_opt.opt_arg ())) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("enqueue_tail")), -1); @@ -1231,14 +1231,14 @@ ACE_Service_Gestalt::parse_args_i (int argc, } if (this->svc_queue_->enqueue_tail (ACE_TString (get_opt.opt_arg ())) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("enqueue_tail")), -1); break; default: if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) %c is not a ACE_Service_Config option\n"), c)); } @@ -1307,7 +1307,7 @@ ACE_Service_Gestalt::close (void) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::close - complete this=%@, repo=%@, owned=%d\n"), this, this->repo_, this->svc_repo_is_owned_)); #endif |