From c96a96d683dfbabbb3b85070605c8d9ef997c4c7 Mon Sep 17 00:00:00 2001 From: matrevis Date: Mon, 11 Sep 2006 21:56:54 +0000 Subject: [PATCH] - Efficiently dropped efficency for the sake of efficiency. git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1097 3ecf2c5c-341e-0410-92b4-d18e462d057c --- src/backend/concrete_process_statistics.cc | 8 ++++---- src/backend/concrete_process_statistics.hh | 2 +- src/backend/concrete_simulation_statistics.cc | 6 +++--- src/backend/concrete_simulation_statistics.hh | 6 +++--- src/backend/concrete_thread_statistics.cc | 8 ++++---- src/backend/concrete_thread_statistics.hh | 2 +- src/backend/sgpemv2/process_statistics.hh | 2 +- src/backend/sgpemv2/schedulable_statistics.hh | 4 ++-- src/backend/sgpemv2/simulation_statistics.hh | 2 +- src/backend/sgpemv2/thread_statistics.hh | 2 +- src/schedulables_statistics_widget.cc | 18 +++++++++--------- src/schedulables_statistics_widget.hh | 4 ++-- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/backend/concrete_process_statistics.cc b/src/backend/concrete_process_statistics.cc index d9bd66a..270ea39 100644 --- a/src/backend/concrete_process_statistics.cc +++ b/src/backend/concrete_process_statistics.cc @@ -118,9 +118,9 @@ ConcreteProcessStatistics::ConcreteProcessStatistics(const Process* core, const _total_inactivity = _turn_around - _execution_time; if (_turn_around == 0) - _efficency = -1; + _efficiency = -1; else - _efficency = (_execution_time*100)/_turn_around; + _efficiency = (_execution_time*100)/_turn_around; _response_time = min_reponse; @@ -164,9 +164,9 @@ ConcreteProcessStatistics::get_turn_around() const } int -ConcreteProcessStatistics::get_efficency() const +ConcreteProcessStatistics::get_efficiency() const { - return _efficency; + return _efficiency; } int diff --git a/src/backend/concrete_process_statistics.hh b/src/backend/concrete_process_statistics.hh index a35383a..5ba5881 100644 --- a/src/backend/concrete_process_statistics.hh +++ b/src/backend/concrete_process_statistics.hh @@ -44,7 +44,7 @@ namespace sgpem int get_response_time() const; float get_average_response_time() const; int get_turn_around() const; - int get_efficency() const; + int get_efficiency() const; int get_resource_usage_time() const; int get_resource_waitings_time() const; diff --git a/src/backend/concrete_simulation_statistics.cc b/src/backend/concrete_simulation_statistics.cc index 0f7653b..a4fe7d4 100644 --- a/src/backend/concrete_simulation_statistics.cc +++ b/src/backend/concrete_simulation_statistics.cc @@ -35,7 +35,7 @@ ConcreteSimulationStatistics::ConcreteSimulationStatistics(const std::vectorget_total_cpu_time(); if (_turn_around == 0) - _efficency = -1; + _efficiency = -1; else - _efficency = (_execution_time*100)/_turn_around; + _efficiency = (_execution_time*100)/_turn_around; } @@ -163,9 +163,9 @@ ConcreteThreadStatistics::get_turn_around() const } int -ConcreteThreadStatistics::get_efficency() const +ConcreteThreadStatistics::get_efficiency() const { - return _efficency; + return _efficiency; } int diff --git a/src/backend/concrete_thread_statistics.hh b/src/backend/concrete_thread_statistics.hh index b4de1c7..57346d7 100644 --- a/src/backend/concrete_thread_statistics.hh +++ b/src/backend/concrete_thread_statistics.hh @@ -43,7 +43,7 @@ namespace sgpem int get_total_inactivity() const; int get_response_time() const; int get_turn_around() const; - int get_efficency() const; + int get_efficiency() const; int get_resource_usage_time() const; int get_resource_waitings_time() const; diff --git a/src/backend/sgpemv2/process_statistics.hh b/src/backend/sgpemv2/process_statistics.hh index 5f8c8e4..ca49e7f 100644 --- a/src/backend/sgpemv2/process_statistics.hh +++ b/src/backend/sgpemv2/process_statistics.hh @@ -45,7 +45,7 @@ namespace sgpem int get_response_time() const =0; virtual float get_average_response_time() const =0; int get_turn_around() const =0; - int get_efficency() const =0; + int get_efficiency() const =0; int get_resource_usage_time() const =0; int get_resource_waitings_time() const =0; diff --git a/src/backend/sgpemv2/schedulable_statistics.hh b/src/backend/sgpemv2/schedulable_statistics.hh index c03cfd1..59dc4df 100644 --- a/src/backend/sgpemv2/schedulable_statistics.hh +++ b/src/backend/sgpemv2/schedulable_statistics.hh @@ -39,7 +39,7 @@ namespace sgpem virtual int get_total_inactivity() const =0; virtual int get_response_time() const =0; virtual int get_turn_around() const =0; - virtual int get_efficency() const =0; + virtual int get_efficiency() const =0; virtual int get_resource_usage_time() const =0; virtual int get_resource_waitings_time() const =0; @@ -54,7 +54,7 @@ namespace sgpem int _total_inactivity; int _response_time; int _turn_around; - int _efficency; + int _efficiency; int _resource_usage_time; int _resource_waitings_time; }; diff --git a/src/backend/sgpemv2/simulation_statistics.hh b/src/backend/sgpemv2/simulation_statistics.hh index 09b9842..f9c3a50 100644 --- a/src/backend/sgpemv2/simulation_statistics.hh +++ b/src/backend/sgpemv2/simulation_statistics.hh @@ -34,7 +34,7 @@ namespace sgpem virtual float get_average_inactivity_time() const =0; virtual float get_average_turn_around() const =0; virtual float get_average_response_time() const =0; - virtual float get_average_efficency() const =0; + virtual float get_average_efficiency() const =0; virtual int get_terminated_processes() const =0; virtual int get_terminated_threads() const =0; virtual float get_average_throughput() const =0; diff --git a/src/backend/sgpemv2/thread_statistics.hh b/src/backend/sgpemv2/thread_statistics.hh index 3d3f668..b798b2d 100644 --- a/src/backend/sgpemv2/thread_statistics.hh +++ b/src/backend/sgpemv2/thread_statistics.hh @@ -41,7 +41,7 @@ namespace sgpem int get_total_inactivity() const =0; int get_response_time() const =0; int get_turn_around() const =0; - int get_efficency() const =0; + int get_efficiency() const =0; int get_resource_usage_time() const =0; int get_resource_waitings_time() const =0; diff --git a/src/schedulables_statistics_widget.cc b/src/schedulables_statistics_widget.cc index 0594607..6eb714e 100644 --- a/src/schedulables_statistics_widget.cc +++ b/src/schedulables_statistics_widget.cc @@ -15,7 +15,7 @@ // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with SGPEMv2; if not, write to the Free Software +// along with SGPEMv2; if not, writee to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -98,8 +98,8 @@ TabularSchedulableStatisticsWidget::update(const History& changed_history) riga_P[_col_resp] = Glib::ustring(s2.str()); riga_P[_col_turn] = p_stats[i_p]->get_turn_around(); stringstream s3; - if (p_stats[i_p]->get_efficency() != -1) - s3 << p_stats[i_p]->get_efficency() << "%"; + if (p_stats[i_p]->get_efficiency() != -1) + s3 << p_stats[i_p]->get_efficiency() << "%"; else s3 << "---"; riga_P[_col_effic] = Glib::ustring(s3.str()); @@ -124,8 +124,8 @@ TabularSchedulableStatisticsWidget::update(const History& changed_history) riga_T[_col_resp] = Glib::ustring(s2.str()); riga_T[_col_turn] = t_stats[i_t]->get_turn_around(); stringstream s3; - if (t_stats[i_t]->get_efficency() != -1) - s3 <get_efficency() << "%"; + if (t_stats[i_t]->get_efficiency() != -1) + s3 <get_efficiency() << "%"; else s3 << "---"; riga_T[_col_effic] = Glib::ustring(s3.str()); @@ -163,7 +163,7 @@ TabularSchedulableStatisticsWidget::update_columns() // append_column(_("Turn Around"), _col_inactive); if (_show_effic) - append_column(_("Efficency"), _col_effic); + append_column(_("Efficiency"), _col_effic); if (_show_ris_usage) append_column(_("Res. usage"), _col_ris_usage); @@ -236,13 +236,13 @@ TabularSchedulableStatisticsWidget::get_show_response() const } void -TabularSchedulableStatisticsWidget::set_show_efficency(bool b) +TabularSchedulableStatisticsWidget::set_show_efficiency(bool b) { _show_effic = b; } bool -TabularSchedulableStatisticsWidget::get_show_efficency() const +TabularSchedulableStatisticsWidget::get_show_efficiency() const { return _show_effic; } @@ -318,4 +318,4 @@ TabularSchedulableStatisticsWidget::calc_widget_size(size_t& width, size_t& heig //width = height = 20; // default minimum size } -*/ \ No newline at end of file +*/ diff --git a/src/schedulables_statistics_widget.hh b/src/schedulables_statistics_widget.hh index 46511f9..ea777f8 100644 --- a/src/schedulables_statistics_widget.hh +++ b/src/schedulables_statistics_widget.hh @@ -56,8 +56,8 @@ namespace sgpem void set_show_response(bool); bool get_show_response() const; - void set_show_efficency(bool); - bool get_show_efficency() const; + void set_show_efficiency(bool); + bool get_show_efficiency() const; void set_show_resource_usage(bool); bool get_show_resource_usage() const;