improved scheduler logging ; use a library

svn path=/trunk/boinc/; revision=1434
This commit is contained in:
Karl Chen 2003-06-14 20:03:09 +00:00
parent f22f27cb7b
commit 72ed6c5c7c
1 changed files with 17 additions and 19 deletions

View File

@ -11,7 +11,7 @@
// The Original Code is the Berkeley Open Infrastructure for Network Computing. // The Original Code is the Berkeley Open Infrastructure for Network Computing.
// //
// The Initial Developer of the Original Code is the SETI@home project. // The Initial Developer of the Original Code is the SETI@home project.
// Portions created by the SETI@home project are Copyright (C) 2002 // Portions created by the SETI@home project are Copyright (C) 2002, 2003
// University of California at Berkeley. All Rights Reserved. // University of California at Berkeley. All Rights Reserved.
// //
// Contributor(s): // Contributor(s):
@ -45,7 +45,7 @@ int get_output_file_path(RESULT& result, char* path) {
int check_set(vector<RESULT>& results, int& canonicalid, double& credit) { int check_set(vector<RESULT>& results, int& canonicalid, double& credit) {
int i, j, n, neq=0, retval, ilow, ihigh, canonical; int i, j, n, neq=0, retval, ilow, ihigh, canonical;
char* files[100]; char* files[100];
char path[256], buf[256]; char path[256];
bool found; bool found;
double c, low=0.0, high=0.0; double c, low=0.0, high=0.0;
@ -57,8 +57,7 @@ int check_set(vector<RESULT>& results, int& canonicalid, double& credit) {
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
retval = get_output_file_path(results[i], path); retval = get_output_file_path(results[i], path);
if (retval) { if (retval) {
fprintf( write_log(MSG_CRITICAL,
stderr,
"check_set: can't get output filename for %s\n", "check_set: can't get output filename for %s\n",
results[i].name results[i].name
); );
@ -66,8 +65,7 @@ int check_set(vector<RESULT>& results, int& canonicalid, double& credit) {
} }
retval = read_file_malloc(path, files[i]); retval = read_file_malloc(path, files[i]);
if (retval) { if (retval) {
sprintf(buf, "read_file_malloc %s %d\n", path, retval); write_log(MSG_CRITICAL, "read_file_malloc %s %d\n", path, retval);
write_log(buf, MSG_CRITICAL);
return retval; return retval;
} }
} }
@ -151,13 +149,13 @@ int check_pair(RESULT& r1, RESULT& r2, bool& match) {
get_output_file_path(r1, path); get_output_file_path(r1, path);
retval = read_file_malloc(path, p1); retval = read_file_malloc(path, p1);
if (retval) { if (retval) {
fprintf(stderr, "read_file_malloc %s %d\n", path, retval); write_log(MSG_CRITICAL, "read_file_malloc %s %d\n", path, retval);
return retval; return retval;
} }
get_output_file_path(r2, path); get_output_file_path(r2, path);
retval = read_file_malloc(path, p2); retval = read_file_malloc(path, p2);
if (retval) { if (retval) {
fprintf(stderr, "read_file_malloc %s %d\n", path, retval); write_log(MSG_CRITICAL, "read_file_malloc %s %d\n", path, retval);
return retval; return retval;
} }
match = !strcmp(p1, p2); match = !strcmp(p1, p2);