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

Merge branch 'master' of boinc.berkeley.edu:boinc-v2

This commit is contained in:
David Anderson 2013-11-22 08:05:03 +00:00
parent aaf6ca608b c2a34cb938
commit 595133d098
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/app_config.cpp
View File

@ -47,7 +47,7 @@ int APP_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
}
if (log_flags.unparsed_xml) {
msg_printf(p, MSG_INFO,
"Unparsed line in app_info.xml: %s",
"Unparsed line in app_config.xml: %s",
xp.parsed_tag
);
}
@ -62,12 +62,13 @@ int APP_VERSION_CONFIG::parse(XML_PARSER& xp, PROJECT* p) {
while (!xp.get_tag()) {
if (xp.match_tag("/app_version")) return 0;
if (xp.parse_str("app_name", app_name, 256)) continue;
if (xp.parse_str("plan_class", plan_class, 256)) continue;
if (xp.parse_str("cmdline", cmdline, 256)) continue;
if (xp.parse_double("avg_ncpus", avg_ncpus)) continue;
if (xp.parse_double("ngpus", ngpus)) continue;
if (log_flags.unparsed_xml) {
msg_printf(p, MSG_INFO,
"Unparsed line in app_info.xml: %s",
"Unparsed line in app_config.xml: %s",
xp.parsed_tag
);
}
@ -99,7 +100,7 @@ int APP_CONFIGS::parse(XML_PARSER& xp, PROJECT* p) {
}
if (log_flags.unparsed_xml) {
msg_printf(p, MSG_INFO,
"Unparsed line in app_info.xml: %s",
"Unparsed line in app_config.xml: %s",
xp.parsed_tag
);
}
@ -149,10 +150,12 @@ void APP_CONFIGS::config_app_versions(PROJECT* p, bool show_warnings) {
if (show_warnings) show_warning(p, avc.app_name);
continue;
}
bool found = false;
for (unsigned int j=0; j<gstate.app_versions.size(); j++) {
APP_VERSION* avp = gstate.app_versions[j];
if (avp->app != app) continue;
if (strcmp(avp->plan_class, avc.plan_class)) continue;
found = true;
if (strlen(avc.cmdline)) {
strcpy(avp->cmdline, avc.cmdline);
}
@ -163,6 +166,11 @@ void APP_CONFIGS::config_app_versions(PROJECT* p, bool show_warnings) {
avp->gpu_usage.usage = avc.ngpus;
}
}
if (!found) {
msg_printf(p, MSG_USER_ALERT,
"Entry in app_config.xml for app '%s', plan class '%s' doesn't match any app versions", avc.app_name, avc.plan_class
);
}
}
}