diff options
Diffstat (limited to 'TAO/tao/Dynamic_TP')
| -rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Config.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Task.cpp | 32 | ||||
| -rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp | 18 |
7 files changed, 43 insertions, 43 deletions
diff --git a/TAO/tao/Dynamic_TP/DTP_Config.cpp b/TAO/tao/Dynamic_TP/DTP_Config.cpp index 79f7defa0ec..09cbd9eefaa 100644 --- a/TAO/tao/Dynamic_TP/DTP_Config.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Config.cpp @@ -174,7 +174,7 @@ TAO_DTP_Config::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Config - ") ACE_TEXT ("Unrecognized argv[%d], %C\n"), curarg, argv[curarg])); @@ -188,7 +188,7 @@ TAO_DTP_Config::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Config - ") ACE_TEXT ("thread count constraint ") ACE_TEXT ("violated, min: %d <= init: %d <= max: ") @@ -215,7 +215,7 @@ TAO_DTP_Config::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Config - ") ACE_TEXT ("cannot initialize registry\n"))); } @@ -295,7 +295,7 @@ TAO_DTP_Config::report_option_value_error (const ACE_TCHAR* option_name, { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Config - unknown ") ACE_TEXT ("argument <%s> for <%s>\n"), option_value, option_name)); diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp index 5ce868d61b1..fc8e97f187f 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp +++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp @@ -32,7 +32,7 @@ TAO_DTP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) if (CORBA::is_nil (tao_info.in ())) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::pre_init:\n") ACE_TEXT ("(%P|%t) Unable to narrow ") ACE_TEXT ("\"PortableInterceptor::ORBInitInfo_ptr\" to\n") @@ -59,7 +59,7 @@ TAO_DTP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) if (config_mgr == 0) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::pre_init:\n") ACE_TEXT ("(%P|%t) Unable to resolve DTP_Config ") ACE_TEXT ("object\n"))); @@ -94,7 +94,7 @@ TAO_DTP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::post_init ") ACE_TEXT ("using thread pool name %s\n"), dtp_name)); } @@ -109,7 +109,7 @@ TAO_DTP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) if (config_registry == 0 || !config_registry->find(dtp_name, def)) { if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_DTP_ORBInitializer::") ACE_TEXT ("post_init:\n") ACE_TEXT ("(%P|%t) Unable to resolve ") diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp index 838e0a7e3d1..ae4794722eb 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp +++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp @@ -45,7 +45,7 @@ TAO_DTP_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_ORB_Loader - ") ACE_TEXT ("DTPORB argument missing value\n"))); } @@ -56,7 +56,7 @@ TAO_DTP_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_ORB_Loader -") ACE_TEXT (" Unrecognized argv[%d], %C\n"), curarg, argv[curarg])); diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp index 6b88f7bf138..c363e8f7553 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp @@ -59,7 +59,7 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[]) { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - ") ACE_TEXT ("cannot initialize strategy repo\n"))); } @@ -73,7 +73,7 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[]) if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - ") ACE_TEXT ("parsing args\n"))); } @@ -102,7 +102,7 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[]) */ if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("DTP_POA_Loader: Missing option\n") ACE_TEXT ("Usage: -DTPPOAConfigMap <comma-separated ") ACE_TEXT ("list of POAs>:<POA Config Name>\n") @@ -132,7 +132,7 @@ TAO_DTP_POA_Loader::load_poa_map (ACE_TCHAR *map, { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("DTP_POA_Loader: Missing option\n") ACE_TEXT ("Usage: -DTPPOAConfigMap <comma-separated ") ACE_TEXT ("list of POAs>:<POA Config Name>\n<%s>.\n"), @@ -175,7 +175,7 @@ TAO_DTP_POA_Loader::report_option_value_error (const ACE_TCHAR* name, { if (TAO_debug_level > 0) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Loader - unknown ") ACE_TEXT ("argument <%s> for <%s>\n"), value, name)); diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp index e715319750b..6a54615da0b 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp @@ -84,7 +84,7 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy - ") ACE_TEXT ("cannot retrieve configuration repo\n"))); } @@ -95,7 +95,7 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) TAO_DTP_Definition config_entry; if (!config_repo->find (this->dynamic_tp_config_name_, config_entry)) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy - ") ACE_TEXT ("warning: config not found...using ") ACE_TEXT ("defaults!\n"))); @@ -397,7 +397,7 @@ TAO_DTP_POA_Strategy::set_dtp_config (TAO_DTP_Definition &tp_config) if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy: ") ACE_TEXT ("Initialized with:\n") ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy initial_pool_threads_=") diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp index 181325fa050..0f32ad86680 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp @@ -52,7 +52,7 @@ TAO_DTP_Task::add_request (TAO::CSD::TP_Request* request) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() ") ACE_TEXT ("not accepting requests.\n") ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() ") @@ -82,7 +82,7 @@ TAO_DTP_Task::add_request (TAO::CSD::TP_Request* request) this->work_available_.signal (); if (TAO_debug_level > 4 ) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::add_request() - ") ACE_TEXT ("work available\n"))); } @@ -136,7 +136,7 @@ TAO_DTP_Task::open (void* /* args */) //if (tmp == 0) // { // //FUZZ: disable check_for_lack_ACE_OS - // ACE_ERROR_RETURN ((LM_ERROR, + // TAOLIB_ERROR_RETURN ((LM_ERROR, // ACE_TEXT ("(%P|%t) DTP_Task::open() failed to open. ") // ACE_TEXT ("Invalid argument type passed to open().\n")), // -1); @@ -153,7 +153,7 @@ TAO_DTP_Task::open (void* /* args */) if (TAO_debug_level > 4) { - ACE_DEBUG((LM_DEBUG, + TAOLIB_DEBUG((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() initialized with:\n") ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() init_threads_ \t\t: [%d]\n") ACE_TEXT ("TAO (%P|%t) - DTP_Task::open() min_pool_threads_ \t\t: [%d]\n") @@ -173,7 +173,7 @@ TAO_DTP_Task::open (void* /* args */) // We can't activate 0 threads. Make sure this isn't the case. if (num < 1) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DTP_Task::open() failed to open. ") ACE_TEXT ("num_threads (%u) is less-than 1.\n"), num), @@ -188,7 +188,7 @@ TAO_DTP_Task::open (void* /* args */) if (this->opened_) { //FUZZ: disable check_for_lack_ACE_OS - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DTP_Task::open() failed to open. ") ACE_TEXT ("Task has previously been open()'ed.\n")), -1); @@ -201,7 +201,7 @@ TAO_DTP_Task::open (void* /* args */) { if (this->activate (THR_NEW_LWP | THR_DETACHED, num, 1) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) DTP_Task::open() failed to activate ") ACE_TEXT ("(%d) worker threads.\n"), num), @@ -226,7 +226,7 @@ TAO_DTP_Task::open (void* /* args */) 0, stack_sz_arr) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) DTP_Task::open() failed to activate ") ACE_TEXT ("(%d) worker threads.\n"), num), @@ -267,7 +267,7 @@ TAO_DTP_Task::clear_request (TAO::CSD::TP_Request_Handle &r) if (TAO_debug_level > 4 ) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Decrementing num_queue_requests.") ACE_TEXT ("New queue depth:%d\n"), @@ -283,7 +283,7 @@ TAO_DTP_Task::svc (void) ++this->busy_threads_; if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("New thread created.\n"))); } @@ -301,7 +301,7 @@ TAO_DTP_Task::svc (void) if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Decrementing busy_threads_. ") ACE_TEXT ("Busy thread count:%d\n"), @@ -327,7 +327,7 @@ TAO_DTP_Task::svc (void) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Existing thread expiring.\n"))); } @@ -339,7 +339,7 @@ TAO_DTP_Task::svc (void) ++this->busy_threads_; if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Incrementing busy_threads_. ") ACE_TEXT ("Busy thread count:%d\n"), @@ -364,7 +364,7 @@ TAO_DTP_Task::svc (void) this->thread_stack_size_ == 0 ? 0 : &this->thread_stack_size_) != 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) DTP_Task::svc() failed to grow ") ACE_TEXT ("to %d worker threads.\n"), count)); } @@ -372,7 +372,7 @@ TAO_DTP_Task::svc (void) { if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Growing threadcount. ") ACE_TEXT ("New thread count:%d\n"), @@ -417,7 +417,7 @@ TAO_DTP_Task::close(u_long flag) size_t in_task = (this->thr_mgr ()->task () == this) ? 1 : 0; if (TAO_debug_level > 4) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP_Task::close() ") ACE_TEXT ("shutting down. in_task = %d, Count = %d \n"), in_task, this->thr_count ())); diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index 1aa8134e253..597a97b1590 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -54,7 +54,7 @@ TAO_DTP_Thread_Pool_Threads::svc (void) catch (const ::CORBA::Exception& ex) { // No point propagating this exception. Print it out. - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("orb->run() raised exception for thread %t\n"))); ex._tao_print_exception (""); @@ -72,7 +72,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) // exit the loop and this thread ends itself. if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP Pool %d - ") ACE_TEXT ("Starting worker, count = %d; ") ACE_TEXT ("setting timeout for %d sec, %d usec\n"), @@ -92,7 +92,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) bool timeout = errno == ETIME; if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP Pool %d ") ACE_TEXT ("run: above_min = %d, timeout = %d\n"), this->pool_.id(), this->pool_.above_minimum(), timeout)); @@ -111,7 +111,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - DTP Pool %d ") ACE_TEXT ("Terminating worker, remaining pool thread count = %d\n"), this->pool_.id (), @@ -135,7 +135,7 @@ TAO_DTP_Thread_Pool::new_dynamic_thread (void) // held. if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) DTP Pool %d new_dynamic_thread, max = %d, current = %d\n"), this->id_, this->definition_.max_threads_, (int)this->threads_.thr_count ())); } @@ -153,7 +153,7 @@ TAO_DTP_Thread_Pool::new_dynamic_thread (void) (int)this->active_count_ < this->definition_.max_threads_)) { if (TAO_debug_level > 7) - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) DTP Pool %d new_dynamic_thread, ") ACE_TEXT ("count = %d, creating new thread\n"), this->id_, @@ -163,7 +163,7 @@ TAO_DTP_Thread_Pool::new_dynamic_thread (void) { if (TAO_debug_level > 0) { - ACE_ERROR ((LM_ERROR, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("Pool %d Thread %t: ") ACE_TEXT ("cannot create dynamic thread\n"), this->id_)); @@ -221,7 +221,7 @@ TAO_DTP_Thread_Pool::create_initial_threads (void) if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) DTP_Thread_Pool::create_initial_threads ") ACE_TEXT ("Creating %d threads\n"), count)); @@ -325,7 +325,7 @@ TAO_DTP_Thread_Pool::wait (void) this->threads_.wait (); if (TAO_debug_level > 7) { - ACE_DEBUG ((LM_DEBUG, + TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) DTP_Thread_Pool::wait, ") ACE_TEXT ("active_count = %d, thread_count = %d\n"), this->active_count_, threads_.thr_count())); |