Python module MySQLdb
diff --git a/doc/tools_work.php b/doc/tools_work.php
index 9eb4fd6289..83a6599016 100644
--- a/doc/tools_work.php
+++ b/doc/tools_work.php
@@ -102,6 +102,10 @@ create_work
// relative to project root
-result_template filename // result template filename
// relative to project root
+ [ -config_dir path ] // where 'config.xml' is;
+ // default = '.'
+ [ -batch n ]
+ [ -priority n ]
// The following are normally supplied in the WU template:
[ -rsc_fpops_est x ]
@@ -118,12 +122,13 @@ create_work
infile_1 ... infile_m // input files
The workunit parameters are documented here.
-The program must be run in the project root directory;
+If the -config_dir option is not used,
+the program must be run in the project root directory;
it looks for config.xml there, and uses its contents.
C++ function interface
-The C++ library (backend_lib.C,h) provides the functions:
+The C++ library (crypt.C, backend_lib.C,h) provides the functions:
int read_key_file(char* path, R_RSA_PRIVATE_KEY& key);
@@ -137,8 +142,7 @@ int create_work(
const char** infiles, // array of input file names
int ninfiles
R_RSA_PRIVATE_KEY& key, // upload authentication key
- const char* upload_url,
- const char* download_url
+ SCHED_CONFIG&
);
diff --git a/doc/work.php b/doc/work.php
index dfade65e57..7e037cb95a 100644
--- a/doc/work.php
+++ b/doc/work.php
@@ -24,33 +24,12 @@ list_item(
);
list_item(
"input files",
- "A list of its input files: their names,
+ "A list of the input files: their names,
and the names by which the application refers to them."
);
list_item(
- "error mask",
- "A bit mask of various error conditions:
-
- - WU_ERROR_COULDNT_SEND_RESULT:
- The BOINC scheduler was unable to send the workunit
- to a large number (~100) of hosts,
- probably because its resource requirements (disk, memory, CPU)
- were too large for the hosts,
- or because no application version was available
- for the hosts' platforms.
-
- WU_ERROR_TOO_MANY_ERROR_RESULTS:
- Too many results with error conditions
- (upload/download problem, client crashes)
- have been returned for this work unit.
-
- WU_ERROR_TOO_MANY_SUCCESS_RESULTS:
- Too many successful results have been returned
- without consensus.
- This indicates that the application may
- be nondeterministic.
-
- WU_ERROR_TOO_MANY_TOTAL_RESULTS:
- Too many total results have been sent for this workunit.
-
- "
+ "priority",
+ "Higher-priority work is dispatched first"
);
list_end();
@@ -151,6 +130,36 @@ list_item(
);
list_end();
+echo "
+A workunit that is in the system has the following attribute:
+";
+list_start();
+list_item(
+ "error mask",
+ "A bit mask of various error conditions:
+
+ - WU_ERROR_COULDNT_SEND_RESULT:
+ The BOINC scheduler was unable to send the workunit
+ to a large number (~100) of hosts,
+ probably because its resource requirements (disk, memory, CPU)
+ were too large for the hosts,
+ or because no application version was available
+ for the hosts' platforms.
+
- WU_ERROR_TOO_MANY_ERROR_RESULTS:
+ Too many results with error conditions
+ (upload/download problem, client crashes)
+ have been returned for this work unit.
+
- WU_ERROR_TOO_MANY_SUCCESS_RESULTS:
+ Too many successful results have been returned
+ without consensus.
+ This indicates that the application may
+ be nondeterministic.
+
- WU_ERROR_TOO_MANY_TOTAL_RESULTS:
+ Too many total results have been sent for this workunit.
+
+ "
+);
+list_end();
echo "
BOINC provides a utility program and C function