- manager: in task properties, display elapsed time if available,

and replace "estimated CPU time remaining" with "estimated time remaining"

svn path=/trunk/boinc/; revision=16604
This commit is contained in:
David Anderson 2008-12-03 17:50:44 +00:00
parent 89548f04da
commit e6a87070f3
4 changed files with 24 additions and 8 deletions

View File

@ -9788,3 +9788,13 @@ David 2 Dec 2008
cpu_sched.cpp
cs_apps.cpp
work_fetch.cpp
David 3 Dec 2008
- manager: in task properties, display elapsed time if available,
and replace "estimated CPU time remaining" with "estimated time remaining"
clientgui/
DltItemProperties.cpp
lib/
gui_rpc_client.h
gui_rpc_client_ops.cpp

View File

@ -155,10 +155,13 @@ void CDlgItemProperties::renderInfos(RESULT* result) {
addProperty(_("Resources"), wxString(result->resources.c_str(), wxConvUTF8));
}
if (result->active_task) {
addProperty(_("Checkpoint CPU time"), FormatTime(result->checkpoint_cpu_time));
addProperty(_("Current CPU time"), FormatTime(result->current_cpu_time));
addProperty(_("Estimated CPU time remaining"),FormatTime(result->estimated_cpu_time_remaining));
addProperty(_("Fraction done"),wxString::Format(wxT("%.3f %%"),floor(result->fraction_done * 100000)/1000));
addProperty(_("CPU time at last checkpoint"), FormatTime(result->checkpoint_cpu_time));
addProperty(_("CPU time"), FormatTime(result->current_cpu_time));
if (result->elapsed_time >= 0) {
addProperty(_("Elapsed time"), FormatTime(result->elapsed_time));
}
addProperty(_("Estimated time remaining"), FormatTime(result->estimated_cpu_time_remaining));
addProperty(_("Fraction done"), wxString::Format(wxT("%.3f %%"), result->fraction_done*100));
addProperty(_("Virtual memory size"), FormatDiskSpace(result->swap_size));
addProperty(_("Working set size"), FormatDiskSpace(result->working_set_size_smoothed));
}

View File

@ -205,6 +205,7 @@ public:
double checkpoint_cpu_time;
double current_cpu_time;
double fraction_done;
double elapsed_time;
double swap_size;
double working_set_size_smoothed;
double estimated_cpu_time_remaining;

View File

@ -337,10 +337,10 @@ void WORKUNIT::clear() {
name.clear();
app_name.clear();
version_num = 0;
rsc_fpops_est = 0.0;
rsc_fpops_bound = 0.0;
rsc_memory_bound = 0.0;
rsc_disk_bound = 0.0;
rsc_fpops_est = 0;
rsc_fpops_bound = 0;
rsc_memory_bound = 0;
rsc_disk_bound = 0;
project = NULL;
app = NULL;
avp = NULL;
@ -385,6 +385,7 @@ int RESULT::parse(MIOFILE& in) {
if (parse_int(buf, "<app_version_num>", app_version_num)) continue;
if (parse_double(buf, "<checkpoint_cpu_time>", checkpoint_cpu_time)) continue;
if (parse_double(buf, "<current_cpu_time>", current_cpu_time)) continue;
if (parse_double(buf, "<elapsed_time>", elapsed_time)) continue;
if (parse_double(buf, "<swap_size>", swap_size)) continue;
if (parse_double(buf, "<working_set_size_smoothed>", working_set_size_smoothed)) continue;
if (parse_double(buf, "<fraction_done>", fraction_done)) continue;
@ -423,6 +424,7 @@ void RESULT::clear() {
checkpoint_cpu_time = 0.0;
current_cpu_time = 0.0;
fraction_done = 0.0;
elapsed_time = -1;
swap_size = 0;
working_set_size_smoothed = 0;
estimated_cpu_time_remaining = 0.0;