mirror of https://github.com/BOINC/boinc.git
svn path=/trunk/boinc/; revision=12644
This commit is contained in:
parent
2e944052a6
commit
3c7d66df91
|
@ -290,9 +290,11 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p) {
|
||||||
if (x == 0) continue;
|
if (x == 0) continue;
|
||||||
fprintf(f,
|
fprintf(f,
|
||||||
" <ip_result>\n"
|
" <ip_result>\n"
|
||||||
|
" <name>%s</name>\n"
|
||||||
" <report_deadline>%f</report_deadline>\n"
|
" <report_deadline>%f</report_deadline>\n"
|
||||||
" <cpu_time_remaining>%f</cpu_time_remaining>\n"
|
" <cpu_time_remaining>%f</cpu_time_remaining>\n"
|
||||||
" </ip_result>\n",
|
" </ip_result>\n",
|
||||||
|
rp->name,
|
||||||
rp->report_deadline,
|
rp->report_deadline,
|
||||||
x
|
x
|
||||||
);
|
);
|
||||||
|
@ -641,6 +643,16 @@ int CLIENT_STATE::handle_scheduler_reply(
|
||||||
}
|
}
|
||||||
for (i=0; i<sr.app_versions.size(); i++) {
|
for (i=0; i<sr.app_versions.size(); i++) {
|
||||||
APP_VERSION& avpp = sr.app_versions[i];
|
APP_VERSION& avpp = sr.app_versions[i];
|
||||||
|
if (strlen(avpp.platform) == 0) {
|
||||||
|
strcpy(avpp.platform, get_primary_platform());
|
||||||
|
} else {
|
||||||
|
if (!is_supported_platform(avpp.platform)) {
|
||||||
|
msg_printf(project, MSG_INTERNAL_ERROR,
|
||||||
|
"App version has unsupported platform %s", avpp.platform
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
APP* app = lookup_app(project, avpp.app_name);
|
APP* app = lookup_app(project, avpp.app_name);
|
||||||
APP_VERSION* avp = lookup_app_version(app, avpp.platform, avpp.version_num);
|
APP_VERSION* avp = lookup_app_version(app, avpp.platform, avpp.version_num);
|
||||||
if (avp) {
|
if (avp) {
|
||||||
|
@ -650,27 +662,12 @@ int CLIENT_STATE::handle_scheduler_reply(
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
avp = new APP_VERSION;
|
avp = new APP_VERSION;
|
||||||
*avp = sr.app_versions[i];
|
*avp = avpp;
|
||||||
retval = link_app_version(project, avp);
|
retval = link_app_version(project, avp);
|
||||||
if (retval) {
|
if (retval) {
|
||||||
msg_printf(project, MSG_INTERNAL_ERROR,
|
|
||||||
"Can't handle application version %s %d in scheduler reply",
|
|
||||||
avp->app_name, avp->version_num
|
|
||||||
);
|
|
||||||
delete avp;
|
delete avp;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (strlen(avp->platform) == 0) {
|
|
||||||
strcpy(avp->platform, get_primary_platform());
|
|
||||||
} else {
|
|
||||||
if (!is_supported_platform(avp->platform)) {
|
|
||||||
msg_printf(project, MSG_INTERNAL_ERROR,
|
|
||||||
"App version has unsupported platform %s", avp->platform
|
|
||||||
);
|
|
||||||
delete avp;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
app_versions.push_back(avp);
|
app_versions.push_back(avp);
|
||||||
}
|
}
|
||||||
for (i=0; i<sr.workunits.size(); i++) {
|
for (i=0; i<sr.workunits.size(); i++) {
|
||||||
|
|
Loading…
Reference in New Issue