Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=2641
This commit is contained in:
David Anderson 2003-11-07 06:17:57 +00:00
parent 00298a4064
commit 82433be1e8
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/boinc_api.C
View File

@ -71,6 +71,7 @@ static bool this_process_active;
static bool time_to_quit = false; static bool time_to_quit = false;
static double last_wu_cpu_time; static double last_wu_cpu_time;
static bool standalone = false; static bool standalone = false;
static double initial_wu_cpu_time;
APP_CLIENT_SHM *app_client_shm; APP_CLIENT_SHM *app_client_shm;
@ -331,7 +332,7 @@ static void on_timer(int a) {
double cur_cpu; double cur_cpu;
double cur_mem; double cur_mem;
boinc_worker_thread_cpu_time(cur_cpu, cur_mem); boinc_worker_thread_cpu_time(cur_cpu, cur_mem);
last_wu_cpu_time = cur_cpu + aid.wu_cpu_time; last_wu_cpu_time = cur_cpu + initial_wu_cpu_time;
update_app_progress(fraction_done, last_wu_cpu_time, last_checkpoint_cpu_time, cur_mem); update_app_progress(fraction_done, last_wu_cpu_time, last_checkpoint_cpu_time, cur_mem);
time_until_fraction_done_update = aid.fraction_done_update_period; time_until_fraction_done_update = aid.fraction_done_update_period;
} }
@ -446,6 +447,11 @@ int boinc_init(bool standalone_ /* = false */) {
retval = boinc_parse_init_data_file(); retval = boinc_parse_init_data_file();
if (retval) return retval; if (retval) return retval;
// copy the WU CPU time to a separate var,
// since we may reread the structure again later.
//
initial_wu_cpu_time = aid.wu_cpu_time;
f = fopen(FD_INIT_FILE, "r"); f = fopen(FD_INIT_FILE, "r");
if (f) { if (f) {
parse_fd_init_file(f); parse_fd_init_file(f);

8
checkin_notes
View File

@ -7560,3 +7560,11 @@ Eric 7 Nov 2003
api/boinc_api.C api/boinc_api.C
apps/upper_case.C apps/upper_case.C
David 6 Nov 2003 (note: Eric's on the other side of the Int. Date Line)
- Fixed bug that cause CPU time to jump whenever Get Preferences.
It's because the app is getting a new aid.wu_cpu_time
as part of reread_prefs; this is incorrectly added to the thread's CPU time.
Solution: make a copy of aid.wu_cpu_time at startup and use the copy.
api/
boinc_api.C