From b1075d44e9bed3bc51264d3bf3b14505096fba32 Mon Sep 17 00:00:00 2001 From: dengg Date: Fri, 30 Mar 2007 18:33:40 +0000 Subject: Fri Mar 30 18:23:43 UTC 2007 Gan Deng --- CIAO/ChangeLog | 51 ++++++++++++---------- .../Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp | 4 +- CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp | 20 ++++----- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c2b30193117..c9315712669 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Mar 30 18:23:43 UTC 2007 Gan Deng + + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp + + Silenced the "unused variables" warnings. + Fri Mar 30 18:09:55 UTC 2007 Gan Deng * DAnCE/ExecutionManager/ExecutionManager.mpc @@ -6,23 +13,23 @@ Fri Mar 30 18:09:55 UTC 2007 Gan Deng Fri Mar 30 18:05:06 UTC 2007 Gan Deng - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h: + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: Added virtual destructors into the class. Fri Mar 30 14:15:58 UTC 2007 Gan Deng - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp + * DAnCE/ExecutionManager/Execution_Manager.cpp: + * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * DAnCE/NodeManager/NodeManager_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: Removed emulated exceptions since they are no longer supported. Also removed the exception @@ -31,23 +38,23 @@ Fri Mar 30 14:15:58 UTC 2007 Gan Deng Thu Mar 29 15:22:08 UTC 2007 Gan Deng - * DAnCE/ExecutionManager/Execution_Manager.cpp + * DAnCE/ExecutionManager/Execution_Manager.cpp: Created a child POA which is configured with Client_Propagated Priority Model. - * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager.mpc + * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp: + * DAnCE/ExecutionManager/Execution_Manager_Impl.h: + * DAnCE/ExecutionManager/ExecutionManager.mpc: Added a get_current_thread_priority() to get the priority of the current thread. Also added debug_level control so the thread priority could be printed out. - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher.mpc + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: + * DAnCE/Plan_Launcher/Plan_Launcher.mpc: Added two new methods. The is_client_propagated_model() checks whether @@ -56,13 +63,13 @@ Thu Mar 29 15:22:08 UTC 2007 Gan Deng will set the client thread priority if the priority model is CLIENT_PROPAGATED on the EM side. - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.h: + * DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp: Added two derived classes which collect benchmarking results of DAnCE. - * DAnCE/Plan_Launcher/Plan_Launcher.cpp + * DAnCE/Plan_Launcher/Plan_Launcher.cpp: Added a command line argument "-z" to allow priority to be specified on Plan_Launcher, and then propagated diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp index d9f8acb3fdb..b7d7400e81b 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Benchmark_Impl.cpp @@ -180,10 +180,10 @@ namespace CIAO history_start_system.collect_basic_stats (stats_4); stats_4.dump_results ("TOTAL -- activateSystem", gsf); -/* + ACE_Throughput_Stats::dump_throughput ("Total", gsf, test_end - test_start, - stats.samples_count ());*/ + stats_1.samples_count ()); } catch (Deployment::ResourceNotAvailable& ex) diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp index 79ad17402dc..cab0d836e37 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp @@ -443,10 +443,10 @@ namespace CIAO RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in ()); - RTCORBA::PriorityMapping *pm = - mapping_manager->mapping (); - - int sched_policy = + RTCORBA::PriorityMapping *pm = + mapping_manager->mapping (); + + int sched_policy = this->orb_->orb_core ()->orb_params ()->ace_sched_policy (); int max_priority = @@ -457,13 +457,11 @@ namespace CIAO CORBA::Short native_priority = (max_priority + min_priority) / 2; - // CORBA::Short desired_priority = 0; - - //if (pm->to_CORBA (native_priority, desired_priority) == 0) - // ACE_ERROR_RETURN ((LM_ERROR, - // "Cannot convert native priority %d to corba priority\n", - // native_priority), - // false); + if (pm->to_CORBA (native_priority, desired_priority) == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot convert native priority %d to corba priority\n", + native_priority), + false); current->the_priority (desired_priority); -- cgit v1.2.1