*** empty log message ***

svn path=/trunk/boinc/; revision=4016
This commit is contained in:
Brian Boshes 2004-08-06 21:54:40 +00:00
parent c2e8f2d64b
commit c37c1c489d
2 changed files with 8 additions and 10 deletions

View File

@ -131,6 +131,7 @@ bool CLIENT_STATE::fix_data_overflow(double tdu, double adu) {
return true;
}
i = 0;
deleted = false;
}
p = projects[i];
deleted_space = delete_results(p, 1);
@ -365,7 +366,7 @@ int CLIENT_STATE::delete_inactive_results(PROJECT *p) {
for(i = 0; i < results.size(); i++) {
result = results[i];
if(!result->is_active || result->state < RESULT_COMPUTE_DONE) {
if(!result->is_active && result->state < RESULT_COMPUTE_DONE) {
result->got_server_ack = true;
unstick_result_files(result);
deleted = true;

View File

@ -203,15 +203,12 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p, double work_req) {
}
fprintf(f, " </app_versions>\n");
}
if (!anything_free(free)){
fprintf(f, " <project_disk_free>%f</project_disk_free>\n", free);
}
if (!total_potential_offender(p, possible)) {
fprintf(f, " <potentially_free_offender>%f</potentially_free_offender>\n", possible);
}
if (!total_potential_self(p, possible)) {
fprintf(f, " <potentially_free_self>%f</potentially_free_self>\n", possible);
}
anything_free(free);
fprintf(f, " <project_disk_free>%f</project_disk_free>\n", free);
total_potential_offender(p, possible);
fprintf(f, " <potentially_free_offender>%f</potentially_free_offender>\n", possible);
total_potential_self(p, possible);
fprintf(f, " <potentially_free_self>%f</potentially_free_self>\n", possible);
if (strlen(p->code_sign_key)) {
fprintf(f, " <code_sign_key>\n%s</code_sign_key>\n", p->code_sign_key);
}