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

- Wrapper: CPU time account was broken on Windows

This commit is contained in:
David Anderson 2013-01-27 23:05:08 -08:00 committed by Oliver Bock
parent 32f8e130a9
commit 98fbd13a9e
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
samples/wrapper/wrapper.cpp
View File

@ -783,10 +783,12 @@ bool TASK::poll(int& status) {
if (GetExitCodeProcess(pid_handle, &exit_code)) {
if (exit_code != STILL_ACTIVE) {
status = exit_code;
final_cpu_time = cpu_time();
if (final_cpu_time < current_cpu_time) {
final_cpu_time = current_cpu_time;
}
final_cpu_time = current_cpu_time;
#ifdef DEBUG
fprintf(stderr, "process exited; current CPU %f final CPU %f\n",
current_cpu_time, final_cpu_time
);
#endif
return true;
}
}
@ -800,7 +802,7 @@ bool TASK::poll(int& status) {
final_cpu_time = (float)ru.ru_utime.tv_sec + ((float)ru.ru_utime.tv_usec)/1e+6;
final_cpu_time -= start_rusage;
#ifdef DEBUG
printf("process exited; current CPU %f final CPU %f\n",
fprintf(stderr, "process exited; current CPU %f final CPU %f\n",
current_cpu_time, final_cpu_time
);
#endif
@ -847,7 +849,13 @@ void TASK::resume() {
// so it shouldn't be called too frequently.
//
double TASK::cpu_time() {
current_cpu_time = process_tree_cpu_time(pid);
double x = process_tree_cpu_time(pid);
// if the process has exited, the above could return zero.
// So update carefully.
//
if (x > current_cpu_time) {
current_cpu_time = x;
}
return current_cpu_time;
}
@ -920,6 +928,8 @@ int main(int argc, char** argv) {
double checkpoint_cpu_time;
// total CPU time at last checkpoint
char buf[256];
_getcwd(buf, 256);
#ifdef _WIN32
SetPriorityClass(GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
#endif
@ -1020,7 +1030,7 @@ int main(int argc, char** argv) {
cpu_time = task.cpu_time();
}
#ifdef DEBUG
printf("cpu time %f, checkpoint CPU time %f frac done %f\n",
fprintf(stderr, "cpu time %f, checkpoint CPU time %f frac done %f\n",
task.starting_cpu + cpu_time,
checkpoint_cpu_time,
frac_done + delta
@ -1041,7 +1051,7 @@ int main(int argc, char** argv) {
}
checkpoint_cpu_time = task.starting_cpu + task.final_cpu_time;
#ifdef DEBUG
printf("cpu time %f, checkpoint CPU time %f frac done %f\n",
fprintf(stderr, "cpu time %f, checkpoint CPU time %f frac done %f\n",
task.starting_cpu + task.final_cpu_time,
checkpoint_cpu_time,
frac_done + task.weight/total_weight