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

- Unix: include db/boinc_db_types.h in installed headers 

- client: small code cleanup, no functional change


svn path=/trunk/boinc/; revision=25857
This commit is contained in:
David Anderson 2012-07-10 17:28:04 +00:00
parent e65da1290d
commit 6a8075046b
3 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -4806,3 +4806,12 @@ Charlie 10 July 2012
buildopenssl.sh
BuildMacBOINC.sh
HowToBuildBOINC_XCode.rtf
David 10 July 2012
- Unix: include db/boinc_db_types.h in installed headers
- client: small code cleanup, no functional change
db/
Makefile.am
client/
time_stats.cpp

39
client/time_stats.cpp
View File

@ -320,12 +320,12 @@ int TIME_STATS::parse(XML_PARSER& xp) {
return 0;
}
#ifdef SIM
else if (xp.parse_double("on_lambda", on_lambda)) continue;
else if (xp.parse_double("connected_lambda", connected_lambda)) continue;
else if (xp.parse_double("active_lambda", active_lambda)) continue;
else if (xp.parse_double("gpu_active_lambda", gpu_active_lambda)) continue;
if (xp.parse_double("on_lambda", on_lambda)) continue;
if (xp.parse_double("connected_lambda", connected_lambda)) continue;
if (xp.parse_double("active_lambda", active_lambda)) continue;
if (xp.parse_double("gpu_active_lambda", gpu_active_lambda)) continue;
#endif
else if (xp.parse_double("last_update", x)) {
if (xp.parse_double("last_update", x)) {
if (x < 0 || x > gstate.now) {
#ifndef SIM
msg_printf(0, MSG_INTERNAL_ERROR,
@ -336,7 +336,8 @@ int TIME_STATS::parse(XML_PARSER& xp) {
last_update = x;
}
continue;
} else if (xp.parse_double("on_frac", x)) {
}
if (xp.parse_double("on_frac", x)) {
if (x <= 0 || x > 1) {
msg_printf(0, MSG_INTERNAL_ERROR,
"bad value %f of time stats on_frac; ignoring", x
@ -345,11 +346,13 @@ int TIME_STATS::parse(XML_PARSER& xp) {
on_frac = x;
}
continue;
} else if (xp.parse_double("connected_frac", x)) {
}
if (xp.parse_double("connected_frac", x)) {
// -1 means undefined; skip check
connected_frac = x;
continue;
} else if (xp.parse_double("cpu_and_network_available_frac", x)) {
}
if (xp.parse_double("cpu_and_network_available_frac", x)) {
if (x <= 0 || x > 1) {
msg_printf(0, MSG_INTERNAL_ERROR,
"bad value %f of time stats cpu_and_network_available_frac; ignoring", x
@ -357,7 +360,9 @@ int TIME_STATS::parse(XML_PARSER& xp) {
} else {
cpu_and_network_available_frac = x;
}
} else if (xp.parse_double("active_frac", x)) {
continue;
}
if (xp.parse_double("active_frac", x)) {
if (x <= 0 || x > 1) {
msg_printf(0, MSG_INTERNAL_ERROR,
"bad value %f of time stats active_frac; ignoring", x
@ -366,7 +371,8 @@ int TIME_STATS::parse(XML_PARSER& xp) {
active_frac = x;
}
continue;
} else if (xp.parse_double("gpu_active_frac", x)) {
}
if (xp.parse_double("gpu_active_frac", x)) {
if (x <= 0 || x > 1) {
msg_printf(0, MSG_INTERNAL_ERROR,
"bad value %f of time stats gpu_active_frac; ignoring", x
@ -375,13 +381,12 @@ int TIME_STATS::parse(XML_PARSER& xp) {
gpu_active_frac = x;
}
continue;
} else {
if (log_flags.unparsed_xml) {
msg_printf(0, MSG_INFO,
"[unparsed_xml] TIME_STATS::parse(): unrecognized: %s\n",
xp.parsed_tag
);
}
}
if (log_flags.unparsed_xml) {
msg_printf(0, MSG_INFO,
"[unparsed_xml] TIME_STATS::parse(): unrecognized: %s\n",
xp.parsed_tag
);
}
}
return ERR_XML_PARSE;

2
db/Makefile.am
View File

@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.incl
## the following headers need to be installed
if INSTALL_HEADERS
pkginclude_HEADERS = boinc_db.h db_base.h
pkginclude_HEADERS = boinc_db.h db_base.h boinc_db_types.h
endif
## other stuff to go into the distribution