diff --git a/checkin_notes b/checkin_notes index 79c7266a52..bad6ddb170 100755 --- a/checkin_notes +++ b/checkin_notes @@ -7082,3 +7082,12 @@ David 25 May 2005 app_control.C cs_apps.C cs_benchmark.C + +David 26 May 2005 + - feeder: added a "-mod n i" option. + This lets you run schedulers on more than one host. + + db/ + boinc_db.C,h + sched/ + feeder.C diff --git a/db/boinc_db.C b/db/boinc_db.C index 10c5f9e4d2..33caa375cc 100644 --- a/db/boinc_db.C +++ b/db/boinc_db.C @@ -1211,7 +1211,9 @@ void WORK_ITEM::parse(MYSQL_ROW& r) { strcpy2(wu.result_template_file, r[i++]); } -int DB_WORK_ITEM::enumerate(int limit, const char* order_clause) { +int DB_WORK_ITEM::enumerate( + int limit, const char* select_clause, const char* order_clause +) { char query[MAX_QUERY_LEN]; int retval; MYSQL_ROW row; @@ -1221,9 +1223,11 @@ int DB_WORK_ITEM::enumerate(int limit, const char* order_clause) { "select high_priority result.id, workunit.* from result left join workunit " "on workunit.id = result.workunitid " "where result.server_state=%d " - "%s" + " %s " + " %s " "limit %d", RESULT_SERVER_STATE_UNSENT, + select_clause, order_clause, limit ); diff --git a/db/boinc_db.h b/db/boinc_db.h index cf94cbc738..c6b5afa1ae 100755 --- a/db/boinc_db.h +++ b/db/boinc_db.h @@ -618,7 +618,7 @@ class DB_WORK_ITEM : public WORK_ITEM, public DB_BASE_SPECIAL { public: DB_WORK_ITEM(DB_CONN* p=0); // CURSOR cursor; - int enumerate(int limit, const char* order_clause); + int enumerate(int limit, const char* select_clause, const char* order_clause); // used by feeder int read_result(); // used by scheduler to read result server state diff --git a/doc/backend_programs.php b/doc/backend_programs.php index 6898b51c18..10ef350b2a 100644 --- a/doc/backend_programs.php +++ b/doc/backend_programs.php @@ -31,6 +31,19 @@ then use the daemon program make_work to copy this workunit as needed to maintain a given supply of work. +

Feeder

+

+This program is supplied by BOINC and is application independent. +It creates a shared-memory segment used to pass database records +to CGI scheduler processes. +It has the command-line option: +

+-mod n i
+
+If present, this instance of the feeder will handle +only workunits for which mod(id, n) = i. +This lets you run schedulers on arbitrarily many machines. +

Transitioner

This program is supplied by BOINC and is application independent. diff --git a/doc/contact.php b/doc/contact.php index 48fbeb7398..7b75c4c520 100644 --- a/doc/contact.php +++ b/doc/contact.php @@ -81,6 +81,7 @@ show_name("Jakob Pedersen"); show_name("Stephen Pellicer"); show_name("Reinhard Prix"); show_name("Andy Read"); +show_name("Kevin Reed"); show_name("Thomas Richard"); show_name("Nikolay Saharov"); show_name("Jens Seidler"); diff --git a/doc/index.php b/doc/index.php index 104dcbe9c7..fbb6cfc638 100644 --- a/doc/index.php +++ b/doc/index.php @@ -49,6 +49,8 @@ computer resources investigate protein-related diseases

  • SETI@home: Look for radio evidence of extraterrestrial life +
  • Cell Computing + (Japanese; requires nonstandard client software) To participate in a project:
    diff --git a/doc/versions.inc b/doc/versions.inc index 1d56986839..9199b977b8 100644 --- a/doc/versions.inc +++ b/doc/versions.inc @@ -61,11 +61,11 @@ $w419 = array( "date"=>"25 Jan 2005", "type"=>win_old(), null, - "