- client: parse APP:non_cpu_intensive correctly.

This got broken somehow.
	- client: don't crash if missing RSS feed file for some reason

svn path=/trunk/boinc/; revision=24942
This commit is contained in:
David Anderson 2011-12-30 06:03:42 +00:00
parent 0320e95637
commit a08ab28d1c
3 changed files with 15 additions and 1 deletions

View File

@ -9672,3 +9672,12 @@ Rom 29 Dec 2011
samples/vboxwrapper/
vboxwrapper.cpp
David 30 Dec 2011
- client: parse APP:non_cpu_intensive correctly.
This got broken somehow.
- client: don't crash if missing RSS feed file for some reason
client/
client_types.cpp
cs_notice.cpp

View File

@ -795,6 +795,7 @@ int APP::parse(XML_PARSER& xp) {
}
if (xp.parse_str("name", name, sizeof(name))) continue;
if (xp.parse_str("user_friendly_name", user_friendly_name, sizeof(user_friendly_name))) continue;
if (xp.parse_bool("non_cpu_intensive", non_cpu_intensive)) continue;
#ifdef SIM
if (xp.parse_double("latency_bound", latency_bound)) continue;
if (xp.parse_double("fpops_est", fpops_est)) continue;
@ -808,7 +809,6 @@ int APP::parse(XML_PARSER& xp) {
checkpoint_period.parse(xp, "/checkpoint_period");
continue;
}
if (xp.parse_bool("non_cpu_intensive", non_cpu_intensive)) continue;
#endif
if (log_flags.unparsed_xml) {
msg_printf(0, MSG_INFO,

View File

@ -746,6 +746,11 @@ void RSS_FEED_OP::handle_reply(int http_op_retval) {
rfp->feed_file_name(filename);
FILE* f = fopen(filename, "r");
if (!f) {
msg_printf(0, MSG_INTERNAL_ERROR,
"RSS feed file '%s' not found", filename
);
}
MIOFILE fin;
fin.init_file(f);
XML_PARSER xp(&fin);