mirror of https://github.com/BOINC/boinc.git
Documentation http://boinc.berkeley.edu/hier_dir.php says:
"Secondly, your validator and assimilator should call int get_output_file_path(RESULT const& result, string& path);" I've updated the example code to do this, and modified Makefile.am so that the correct objects are linked. svn path=/trunk/boinc/; revision=4984
This commit is contained in:
parent
b070f4f515
commit
46e9e69771
|
@ -104,10 +104,10 @@ sample_trivial_validator_DEPENDENCIES = $(LIB_SCHED)
|
||||||
validator_placeholder_SOURCES = validator.C validator_placeholder.C validate_util.C validate_util.h
|
validator_placeholder_SOURCES = validator.C validator_placeholder.C validate_util.C validate_util.h
|
||||||
validator_placeholder_DEPENDENCIES = $(LIB_SCHED)
|
validator_placeholder_DEPENDENCIES = $(LIB_SCHED)
|
||||||
|
|
||||||
sample_dummy_assimilator_SOURCES = assimilator.C sample_dummy_assimilator.C
|
sample_dummy_assimilator_SOURCES = assimilator.C sample_dummy_assimilator.C validate_util.C validate_util.h
|
||||||
sample_dummy_assimilator_DEPENDENCIES = $(LIB_SCHED)
|
sample_dummy_assimilator_DEPENDENCIES = $(LIB_SCHED)
|
||||||
|
|
||||||
assimilator_placeholder_SOURCES = assimilator.C assimilator_placeholder.C
|
assimilator_placeholder_SOURCES = assimilator.C assimilator_placeholder.C validate_util.C validate_util.h
|
||||||
assimilator_placeholder_DEPENDENCIES = $(LIB_SCHED)
|
assimilator_placeholder_DEPENDENCIES = $(LIB_SCHED)
|
||||||
|
|
||||||
db_dump_SOURCES = db_dump.C
|
db_dump_SOURCES = db_dump.C
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
// replace it with your own code and then 'make' in this Directory
|
// replace it with your own code and then 'make' in this Directory
|
||||||
// will build it.
|
// will build it.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// The contents of this file are subject to the BOINC Public License
|
// The contents of this file are subject to the BOINC Public License
|
||||||
// Version 1.0 (the "License"); you may not use this file except in
|
// Version 1.0 (the "License"); you may not use this file except in
|
||||||
// compliance with the License. You may obtain a copy of the License at
|
// compliance with the License. You may obtain a copy of the License at
|
||||||
|
@ -32,8 +30,10 @@
|
||||||
#include "sched_msgs.h"
|
#include "sched_msgs.h"
|
||||||
#include "sched_util.h"
|
#include "sched_util.h"
|
||||||
#include "assimilate_handler.h"
|
#include "assimilate_handler.h"
|
||||||
|
#include "validate_util.h"
|
||||||
|
|
||||||
using std::vector;
|
using std::vector;
|
||||||
|
using std::string;
|
||||||
|
|
||||||
int assimilate_handler(
|
int assimilate_handler(
|
||||||
WORKUNIT& wu, vector<RESULT>& results, RESULT& canonical_result
|
WORKUNIT& wu, vector<RESULT>& results, RESULT& canonical_result
|
||||||
|
@ -41,11 +41,16 @@ int assimilate_handler(
|
||||||
SCOPE_MSG_LOG scope_messages(log_messages, SCHED_MSG_LOG::NORMAL);
|
SCOPE_MSG_LOG scope_messages(log_messages, SCHED_MSG_LOG::NORMAL);
|
||||||
scope_messages.printf("[%s] Assimilating\n", wu.name);
|
scope_messages.printf("[%s] Assimilating\n", wu.name);
|
||||||
if (wu.canonical_resultid) {
|
if (wu.canonical_resultid) {
|
||||||
|
string output_file_name;
|
||||||
|
|
||||||
scope_messages.printf("[%s] Found canonical result\n", wu.name);
|
scope_messages.printf("[%s] Found canonical result\n", wu.name);
|
||||||
log_messages.printf_multiline(
|
log_messages.printf_multiline(
|
||||||
SCHED_MSG_LOG::DEBUG, canonical_result.xml_doc_out,
|
SCHED_MSG_LOG::DEBUG, canonical_result.xml_doc_out,
|
||||||
"[%s] canonical result", wu.name
|
"[%s] canonical result", wu.name
|
||||||
);
|
);
|
||||||
|
if (!(get_output_file_path(canonical_result, output_file_name))) {
|
||||||
|
scope_messages.printf("[%s] Output file path %s\n", wu.name, output_file_name.c_str());
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
scope_messages.printf("[%s] No canonical result\n", wu.name);
|
scope_messages.printf("[%s] No canonical result\n", wu.name);
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,8 +25,10 @@
|
||||||
#include "sched_msgs.h"
|
#include "sched_msgs.h"
|
||||||
#include "sched_util.h"
|
#include "sched_util.h"
|
||||||
#include "assimilate_handler.h"
|
#include "assimilate_handler.h"
|
||||||
|
#include "validate_util.h"
|
||||||
|
|
||||||
using std::vector;
|
using std::vector;
|
||||||
|
using std::string;
|
||||||
|
|
||||||
int assimilate_handler(
|
int assimilate_handler(
|
||||||
WORKUNIT& wu, vector<RESULT>& results, RESULT& canonical_result
|
WORKUNIT& wu, vector<RESULT>& results, RESULT& canonical_result
|
||||||
|
@ -34,11 +36,16 @@ int assimilate_handler(
|
||||||
SCOPE_MSG_LOG scope_messages(log_messages, SCHED_MSG_LOG::NORMAL);
|
SCOPE_MSG_LOG scope_messages(log_messages, SCHED_MSG_LOG::NORMAL);
|
||||||
scope_messages.printf("[%s] Assimilating\n", wu.name);
|
scope_messages.printf("[%s] Assimilating\n", wu.name);
|
||||||
if (wu.canonical_resultid) {
|
if (wu.canonical_resultid) {
|
||||||
|
string output_file_name;
|
||||||
|
|
||||||
scope_messages.printf("[%s] Found canonical result\n", wu.name);
|
scope_messages.printf("[%s] Found canonical result\n", wu.name);
|
||||||
log_messages.printf_multiline(
|
log_messages.printf_multiline(
|
||||||
SCHED_MSG_LOG::DEBUG, canonical_result.xml_doc_out,
|
SCHED_MSG_LOG::DEBUG, canonical_result.xml_doc_out,
|
||||||
"[%s] canonical result", wu.name
|
"[%s] canonical result", wu.name
|
||||||
);
|
);
|
||||||
|
if (!(get_output_file_path(canonical_result, output_file_name))) {
|
||||||
|
scope_messages.printf("[%s] Output file path %s\n", wu.name, output_file_name.c_str());
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
scope_messages.printf("[%s] No canonical result\n", wu.name);
|
scope_messages.printf("[%s] No canonical result\n", wu.name);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue