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

*** empty log message *** 

svn path=/trunk/boinc/; revision=11700
This commit is contained in:
David Anderson 2006-12-19 20:49:12 +00:00
parent b75fa89a8b
commit 017927ba8c
9 changed files with 156 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -13532,3 +13532,13 @@ David 19 Dec 2006
http_curl.C
log_flags.C,h
scheduler_op.C
David 19 Dec 2006
- boinc_cmd: fix help()
- get rid of some unused error codes
lib/
boinc_cmd.C
crypt.C
error_numbers.h
util.C

6
doc/boinc_news.php
View File

@ -2,15 +2,15 @@
$project_news = array(
array("December 8, 2006",
"<a href=http://boinc.berkeley.edu/images/boinccast.gif><img align=right src=images/boinccast_small.png></a>
"<a href=http://boinc.berkeley.edu/skins.php><img align=right src=images/boinccast_small.png></a>
Olaf Bornack of
<a href=http://www.boinc-halle-saale.de/>Team BOINC@Halle/Saale</a>
has supplied
<a href=http://boinc.berkeley.edu/manager_skin.php#stencils>stencils</a>
for creating skins for the new BOINC GUI.
These have been used to make skins with
<a href=http://boinc.berkeley.edu/images/boinccast.gif>BOINCcast</a>
and <a href=http://boinc.berkeley.edu/images/skin_halle_saale.gif>BOINC@Halle/Saale</a> themes.
<a href=http://boinc.berkeley.edu/skins.php>BOINCcast,
BOINC@Halle/Saale, and BOINCmas!</a> themes.
<br clear=all>
"
),

5
doc/client_msgs.php
View File

@ -25,6 +25,7 @@ This file has the following format:
<options>
[ <save_stats_days>N</save_stats_days> ]
[ <dont_check_file_sizes>0|1</dont_check_file_sizes> ]
[ <http_1_0>0|1</http_1_0> ]
[ <ncpus>N</ncpus> ]
[ <max_file_xfers>N</max_file_xfers> ]
[ <max_file_xfers_per_project>N</max_file_xfers_per_project> ]
@ -154,6 +155,10 @@ list_item_func("<dont_check_file_sizes>",
If this flag is set, this check is skipped.
Use it if you need to modify files locally for some reason."
);
list_item_func("<http_1_0>",
"Set this flag to use HTTP 1.0 instead of 1.1
(this may be needed with some proxies)."
);
list_item_func("<ncpus>",
"Act as if there were N CPUs: run N tasks at once.
This is for debugging, i.e. to simulate 2 CPUs

4
doc/links.php
View File

@ -219,6 +219,10 @@ language("Japanese", array(
"http://boinc.oocp.org/",
"translation by Komori Hitoshi")
));
language("Korean", array(
site("http://boincatkorea.xo.st/", "BOINC@KOREA"),
));
language("Polish", array(
site("http://www.boinc.org.pl/", "Team boinc.pl"),
site("http://www.boinc.prv.pl", "BOINC@Kolobrzeg"),

194
doc/project_options.php
View File

@ -12,70 +12,34 @@ echo "
The following elements in the &lt;config&gt; section
of your <a href=configuration.php>config.xml</a> file
control various aspects of your project.
<h3>Hosts, directories, and URLs</h3>
<p>
(These are created by make_project; normally you don't need to change them.)
";
echo html_text("
<master_url> URL </master_url>
<long_name> name </long_name>
<host> project.hostname.ip </host>
<db_name> databasename </db_name>
<db_host> database.host.ip </db_host>
<db_user> database_user_name </db_user>
<db_passwd> database_password </db_passwd>
<shmem_key> shared_memory_key </shmem_key>
<download_url> http://A/URL </download_url>
<download_dir> /path/to/directory </download_dir>
<download_dir_alt> /path/to/directory </download_dir_alt>
<uldl_dir_fanout> N </uldl_dir_fanout>
<upload_url> http://A/URL </upload_url>
<upload_dir> /path/to/directory </upload_dir>
<cgi_url> http://A/URL </cgi_url>
[ <disable_account_creation/> ]
[ <profile_screening/> ]
[ <show_results/> ]
[ <one_result_per_user_per_wu/> ]
[ <max_wus_to_send> N </max_wus_to_send> ]
[ <non_cpu_intensive> 0|1 </non_cpu_intensive> ]
[ <min_sendwork_interval> N </min_sendwork_interval> ]
[ <daily_result_quota> N </daily_result_quota> ]
[ <ignore_delay_bound/> ]
[ <dont_generate_upload_certificates/> ]
[ <locality_scheduling/> ]
[ <locality_scheduling_wait_period> N </locality_scheduling_wait_period> ]
[ <min_core_client_version> N </min_core_client_version ]
[ <choose_download_url_by_timezone/> ]
[ <min_core_client_version_announced> N </min_core_client_version_announced> ]
[ <min_core_client_upgrade_deadline> N </min_core_client_upgrade_deadline> ]
[ <choose_download_url_by_timezone> N </choose_download_url_by_timezone> ]
[ <cache_md5_info> 0|1 </cache_md5_info> ]
[ <nowork_skip> 0|1 </nowork_skip> ]
[ <resend_lost_results> 0|1 </resend_lost_results> ]
[ <sched_lockfile_dir> path </sched_lockfile_dir> ]
[ <min_passwd_length> N </min_passwd_length> ]
[ <fp_benchmark_weight> X </fp_benchmark_weight> ]
[ <default_disk_max_used_gb> X </default_disk_max_used_gb> ]
[ <default_disk_max_used_pct> X </default_disk_max_used_pct> ]
[ <default_disk_min_free_gb> X </default_disk_min_used_pct> ]
[ <max_claimed_credit>X</max_claimed_credit ]
[ <grant_claimed_credit/> ]
[ <symstore>URL</symstore> ]
[ <dont_delete_batches/> ]
[ <sched_debug_level> N </sched_debug_level> ]
[ <fuh_debug_level> N </fuh_debug_level> ]
[ <verify_files_on_app_start/> ]
<!-- optional; defaults as indicated: -->
<project_dir> ../ </project_dir> <!-- relative to location of 'start' -->
<master_url> URL </master_url>
<long_name> name </long_name>
<host> project.hostname.ip </host>
<db_name> databasename </db_name>
<db_host> database.host.ip </db_host>
<db_user> database_user_name </db_user>
<db_passwd> database_password </db_passwd>
<shmem_key> shared_memory_key </shmem_key>
<download_url> http://A/URL </download_url>
<download_dir> /path/to/directory </download_dir>
<download_dir_alt> /path/to/directory </download_dir_alt>
<uldl_dir_fanout> N </uldl_dir_fanout>
<upload_url> http://A/URL </upload_url>
<upload_dir> /path/to/directory </upload_dir>
<cgi_url> http://A/URL </cgi_url>
<!-- optional; defaults as indicated: -->
<project_dir> ../ </project_dir> <!-- relative to location of 'start' -->
<bin_dir> bin </bin_dir> <!-- relative to project_dir -->
<cgi_bin_dir> cgi-bin </cgi_dir> <!-- relative to project_dir -->
</config>
")
;
[ <sched_lockfile_dir> path </sched_lockfile_dir> ]
");
list_start();
list_bar("Hosts, directories, and URLs (these are created
by make_project; normally you don't need to change them)");
list_option("host",
"name of project's main host, as given by Python's socket.hostname().
Daemons and tasks run on this host by default."
@ -102,7 +66,15 @@ list_option("sched_lockfile_dir",
directory where scheduler lockfiles are stored.
Must be writable to the Apache user.
");
list_bar("Web site features");
list_end();
echo "
<h3>Web site features</h3>
";
echo html_text("
[ <profile_screening/> ]
[ <show_results/> ]
");
list_start();
list_option("profile_screening",
"If present, don't show profile pictures until they've been
screened and approved by project admins."
@ -110,16 +82,35 @@ list_option("profile_screening",
list_option("show_results",
"Enable web site features that show results (per user, host, etc.)"
);
list_end();
list_bar( "Miscellaneous");
echo "
<h3>Miscellaneous</h3>
";
echo html_text("
[ <disable_account_creation/> ]
[ <min_passwd_length> N </min_passwd_length> ]
");
list_start();
list_option("disable_account_creation",
"If present, disallow account creation"
);
list_option("min_passwd_length",
"Minimum length of user passwords. Default is 6."
);
list_end();
list_bar( "Client control");
echo "
<h3>Client control</h3>
";
echo html_text("
[ <verify_files_on_app_start/> ]
[ <symstore>URL</symstore> ]
[ <min_core_client_version_announced> N </min_core_client_version_announced> ]
[ <min_core_client_upgrade_deadline> N </min_core_client_upgrade_deadline> ]
[ <non_cpu_intensive> 0|1 </non_cpu_intensive> ]
");
list_start();
list_option("verify_files_on_app_start",
"Before starting or restarting an app,
check contents of input files and app version files
@ -157,7 +148,15 @@ list_option("non_cpu_intensive",
<a href=non_cpu_intensive.php>applications that use little CPU time</a>,
e.g. that do network or host measurements."
);
list_bar( "Server logging");
list_end();
echo "
<h3>Server logging</h3>
";
echo html_text("
[ <sched_debug_level> N </sched_debug_level> ]
[ <fuh_debug_level> N </fuh_debug_level> ]
");
list_start();
list_option("sched_debug_level",
"Verbosity level for scheduler log output.
1=minimal, 2=normal (default), 3=verbose."
@ -167,7 +166,16 @@ list_option("fuh_debug_level",
1=minimal, 2=normal (default), 3=verbose."
);
list_bar( "Credit");
list_end();
echo "
<h3>Credit</h3>
";
echo html_text("
[ <fp_benchmark_weight> X </fp_benchmark_weight> ]
[ <max_claimed_credit>X</max_claimed_credit ]
[ <grant_claimed_credit/> ]
");
list_start();
list_option("fp_benchmark_weight",
"The weighting given to the Whetstone benchmark
in the calculation of claimed credit.
@ -180,7 +188,29 @@ list_option("fp_benchmark_weight",
run against the database of a running project,
will suggest what value to use."
);
list_bar( "Scheduling options and parameters");
list_end();
echo "
<h3>Scheduling options and parameters</h3>
";
echo html_text("
[ <one_result_per_user_per_wu/> ]
[ <max_wus_to_send> N </max_wus_to_send> ]
[ <min_sendwork_interval> N </min_sendwork_interval> ]
[ <daily_result_quota> N </daily_result_quota> ]
[ <ignore_delay_bound/> ]
[ <dont_generate_upload_certificates/> ]
[ <locality_scheduling/> ]
[ <locality_scheduling_wait_period> N </locality_scheduling_wait_period> ]
[ <min_core_client_version> N </min_core_client_version ]
[ <choose_download_url_by_timezone> 0|1 </choose_download_url_by_timezone> ]
[ <cache_md5_info> 0|1 </cache_md5_info> ]
[ <nowork_skip> 0|1 </nowork_skip> ]
[ <resend_lost_results> 0|1 </resend_lost_results> ]
[ <default_disk_max_used_gb> X </default_disk_max_used_gb> ]
[ <default_disk_max_used_pct> X </default_disk_max_used_pct> ]
[ <default_disk_min_free_gb> X </default_disk_min_used_pct> ]
");
list_start();
list_option("one_result_per_user_per_wu",
"If present, send at most one result of a given workunit to a given user.
This is useful for checking accuracy/validity of results.
@ -345,8 +375,15 @@ list_item("reliable_time<br> reliable_min_avg_credit<br>
(typically 0.5 or so).
"
);
list_end();
list_bar( "File deleter options");
echo "
<h3>File deleter options</h3>
";
echo html_text("
[ <dont_delete_batches/> ]
");
list_start();
list_option("dont_delete_batches",
"If this boolean is set,
the file deleter won't delete any files for which
@ -360,6 +397,31 @@ list_option("dont_delete_batches",
If you use this option, replace the indices on
file_delete_state with indices on (file_delete_state, batch)."
);
list_end();
echo "
<h3>Server status page options</h3>
";
echo html_text("
[ <www_host>hostname</www_host> ]
[ <sched_host>hostname</sched_host> ]
[ <sched_pid>path</sched_pid> ]
[ <uldl_host>hostname</uldl_host> ]
[ <uldl_pid>path</uldl_pid> ]
[ <ssh_exe>path</ssh_exe> ]
[ <ps_exe>path</ps_exe> ]
");
list_start();
list_option("www_host", "Host name of web server");
list_option("sched_host", "Host name of scheduling server");
list_option("sched_pid",
"pid file of scheduling server (default: /etc/httpd/run/httpd.pid)"
);
list_option("uldl_host", "Host name of upload/download server");
list_option("sched_pid",
"pid file of upload/download server (default: /etc/httpd/run/httpd.pid)"
);
list_option("ssh_exe", "path to ssh (default: /usr/bin/ssh)");
list_option("ps_exe", "path to ps (which supports \"w\" flag) (default: /bin/ps)");
list_end();

7
lib/boinc_cmd.C
View File

@ -59,7 +59,7 @@ void version(){
}
void help() {
printf("\n\n\
fprintf(stderr, "\n\n\
usage: boinc_cmd [--host hostname] [--passwd passwd] command\n\n\
Commands:\n\
--get_state show entire state\n\
@ -72,8 +72,8 @@ Commands:\n\
--project url {reset | detach | update | suspend | resume | nomorework | allowmorework}\n\
--project_attach url auth\n\
--file_transfer url filename {retry | abort}\n\
--set_run_mode {always | auto | never}\n\
--set_network_mode {always | auto | never}\n\
--set_run_mode {always | auto | never} duration\n\
--set_network_mode {always | auto | never} duration\n\
--get_proxy_settings\n\
--set_proxy_settings\n\
--get_messages seqno show messages > seqno\n\
@ -116,6 +116,7 @@ void show_error(int retval) {
char* next_arg(int argc, char** argv, int& i) {
if (i >= argc) {
fprintf(stderr, "Missing command-line argument\n");
help();
exit(1);
}
return argv[i++];

4
lib/crypt.C
View File

@ -196,9 +196,9 @@ int sscan_key_hex(const char* buf, KEY* key, int size) {
key->bits = num_bits; //key->bits is a short
//fprintf(stderr, "key->bits = %d\n", key->bits);
if (n != 1) return ERR_SCANF;
if (n != 1) return ERR_XML_PARSE;
buf = strchr(buf, '\n');
if (!buf) return ERR_STRCHR;
if (!buf) return ERR_XML_PARSE;
buf += 1;
db.data = key->data;
db.len = size - sizeof(key->bits); //huh???

4
lib/error_numbers.h
View File

@ -73,8 +73,6 @@
#define ERR_BENCHMARK_FAILED -133
#define ERR_BAD_HEX_FORMAT -134
// hex-format key data is bad
#define ERR_USER_REJECTED -135
// user rejected executable file
#define ERR_DB_NOT_FOUND -136
// no rows found in lookup() or enumerate()
#define ERR_DB_NOT_UNIQUE -137
@ -84,8 +82,6 @@
// gets() or fgets()
#define ERR_SCANF -140
// scanf() or fscanf()
#define ERR_STRCHR -141
#define ERR_STRSTR -142
#define ERR_READDIR -143
#define ERR_SHMGET -144
#define ERR_SHMCTL -145

3
lib/util.C
View File

@ -1111,14 +1111,11 @@ const char* boincerror(int which_error) {
case ERR_GETRUSAGE: return "system getrusage";
case ERR_BENCHMARK_FAILED: return "benchmark failed";
case ERR_BAD_HEX_FORMAT: return "hex format key data bad";
case ERR_USER_REJECTED: return "user rejected executable file";
case ERR_DB_NOT_FOUND: return "no database rows found in lookup/enumerate";
case ERR_DB_NOT_UNIQUE: return "database lookup not unique";
case ERR_DB_CANT_CONNECT: return "can't connect to datbase";
case ERR_GETS: return "system gets/fgets";
case ERR_SCANF: return "system scanf/fscanf";
case ERR_STRCHR: return "system strchr";
case ERR_STRSTR: return "system strstr";
case ERR_READDIR: return "system readdir";
case ERR_SHMGET: return "system shmget";
case ERR_SHMCTL: return "system shmctl";