- client: just send 1 copy of app versions

svn path=/trunk/boinc/; revision=21516
This commit is contained in:
David Anderson 2010-05-14 03:08:23 +00:00
parent 35cd242539
commit 68e5199fe7
3 changed files with 13 additions and 31 deletions

View File

@ -3639,3 +3639,9 @@ David 13 May 2010
scheduler_op.cpp
sched/
sched_config.h
David 13 May 2010
- client: just send 1 copy of app versions
client/
cs_scheduler.cpp

View File

@ -142,17 +142,6 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p) {
write_platforms(p, mf);
// send supported app_versions for anonymous platform clients
//
if (p->anonymous_platform) {
fprintf(f, " <app_versions>\n");
for (i=0; i<app_versions.size(); i++) {
APP_VERSION* avp = app_versions[i];
if (avp->project != p) continue;
avp->write(mf, false);
}
fprintf(f, " </app_versions>\n");
}
if (strlen(p->code_sign_key)) {
fprintf(f, " <code_sign_key>\n%s</code_sign_key>\n", p->code_sign_key);
}
@ -296,26 +285,7 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p) {
fprintf(f, "<app_versions>\n");
for (i=0; i<app_versions.size(); i++) {
APP_VERSION* avp = app_versions[i];
fprintf(f,
" <app_version>\n"
" <app_name>%s</app_name>\n"
" <version_num>%d</version_num>\n"
" <platform>%s</platform>\n"
" <plan_class>%s</plan_class>\n"
" <avg_ncpus>%f</avg_ncpus>\n"
" <ncudas>%f</ncudas>\n"
" <natis>%f</natis>\n"
" <flops>%f</flops>\n"
" </app_version>\n",
avp->app->name,
avp->version_num,
avp->platform,
avp->plan_class,
avp->avg_ncpus,
avp->ncudas,
avp->natis,
avp->flops
);
avp->write(mf, false);
avp->index = i;
}
fprintf(f, "</app_versions>\n");

View File

@ -419,6 +419,9 @@ const char* SCHEDULER_REQUEST::parse(FILE* fin) {
return "no end tag";
}
// I'm not real sure why this is here.
// Why not copy the request message directly?
//
int SCHEDULER_REQUEST::write(FILE* fout) {
unsigned int i;
@ -665,6 +668,9 @@ int SCHEDULER_REPLY::write(FILE* fout, SCHEDULER_REQUEST& sreq) {
fprintf(fout,"<project_is_down/>\n");
goto end;
}
if (config.workload_sim) {
fprintf(fout, "<send_full_workload\n");
}
if (nucleus_only) goto end;