diff --git a/checkin_notes b/checkin_notes index dc64bba6c3..eeeb07a195 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8337,3 +8337,15 @@ David 2 Aug 2006 cs_prefs.C lib/ prefs.C + +David 2 Aug 2006 + - Reminder email: checked in SETI@home examples, + just to make things more concrete. + Other projects had better change these before use, + or they'll look fairly clueless. + - core client: clarified meaning of "episode" in comments + + client/ + app.h + html/ops/ + remind_email/* diff --git a/client/app.h b/client/app.h index 2c2ab5f22a..34aac115e0 100644 --- a/client/app.h +++ b/client/app.h @@ -65,8 +65,11 @@ typedef int PROCESS_ID; // Represents a task in progress. -// The execution of a task may be divided into many "episodes" -// (if the host is turned off/on, e.g.) +// The execution of a task is divided into "episodes". +// An episode starts then the application is executed, +// and ends when it exits or dies +// (e.g., because it's preempted and not left in memory, +// or the user quits BOINC, or the host is turned off). // A task may checkpoint now and then. // Each episode begins with the state of the last checkpoint. // diff --git a/doc/client_msgs.php b/doc/client_msgs.php index 376105ad6c..be3e73d6dd 100644 --- a/doc/client_msgs.php +++ b/doc/client_msgs.php @@ -54,7 +54,8 @@ The following messages are enabled by default: "; list_start(); list_item_func("", - "The start and completion of computational tasks." + "The start and completion of compute jobs + (should get two messages per job)." ); list_item_func("", "The start and completion of file transfers." @@ -82,8 +83,8 @@ list_item_func("", "Changes to project debt" ); list_item_func("", - "Task start and control details. - Also prints messages when applications checkpoint." + "Prints messages when tasks are preempted and resumed, + and when applications checkpoint." ); list_item_func("", "Work fetch policy decisions" diff --git a/doc/download.php b/doc/download.php index 0c6b31a714..8cafa17319 100755 --- a/doc/download.php +++ b/doc/download.php @@ -1,241 +1,112 @@ $x - $y - "; -} - -function show_detail($v) { - global $url_base; - $num = $v["num"]; - $file = $v["file"]; - $status = $v["status"]; - $path = "dl/$file"; - $url = $url_base.$file; - $dlink = "$file"; - //$md = md5_file($path); - $s = number_format(filesize($path)/1000000, 2); - $date = $v["date"]; - $type = type_text($v["type"]); - $features = $v["features"]; - $bugs = $v["bugs"]; - - list_start(); - dl_item("File (click to download)", "$dlink ($s MB)"); - dl_item("Version number", $num); - dl_item("Release date", $date); - dl_item("Installer type", $type); - //dl_item("MD5 checksum of download file", $md); - if ($features) { - dl_item ("New features", $features); - } - if ($bugs) { - dl_item ("Known problems", $bugs); - } - list_end(); -} - - -function show_version_xml($v, $p) { - global $url_base; - $name = $p["name"]; - $dbname = $p["dbname"]; - $num = $v["num"]; - $file = $v["file"]; - $status = $v["status"]; - $path = "dl/$file"; - $url = $url_base.$file; - $dlink = "$file"; - //$md = md5_file($path); - $s = number_format(filesize($path)/1000000, 2); - $date = $v["date"]; - $type = type_text($v["type"]); - $features = $v["features"]; - $bugs = $v["bugs"]; - $bugs = htmlspecialchars($bugs); - $features = htmlspecialchars($features); - echo " - - $name - $dbname - $status - $date - $num - $url - $file - $s - $type - $features - $bugs - -"; -// $md -} - -function show_version($pname, $i, $v) { - global $url_base; - $num = $v["num"]; - $file = $v["file"]; - $status = $v["status"]; - if (is_dev($v)) { - $status = $status." - - (MAY BE UNSTABLE - USE ONLY FOR TESTING) - - "; - } - $path = "dl/$file"; - $s = number_format(filesize($path)/1000000, 2); - $type = $v["type"]; - $type_text = type_text($type); - echo " - $num $status - - - - Download ($s MB) - - - Instructions: $type_text - - - version details - - - "; -} - -function show_platform($short_name, $p, $dev) { - global $min_version; - global $max_version; - $long_name = $p["name"]; - if ($p["url"]) { - $url = $p["url"]; - $long_name .= " details"; - } - list_bar($long_name); - foreach ($p["versions"] as $i=>$v) { - if ($min_version && strcmp($v['num'], $min_version)<0) continue; - if ($max_version && strcmp($v['num'], $max_version)>0) continue; +function latest_version($p) { + foreach ($p['versions'] as $i=>$v) { if (!$dev && is_dev($v)) continue; - show_version($short_name, $i, $v); + return $v; } } -function show_platform_xml($short_name, $p, $dev) { - foreach ($p["versions"] as $i=>$v) { - if (!$dev && is_dev($v)) continue; - show_version_xml($v, $p); - } -} - -// show details on a version if URL indicates -// -if ($pname && $version) { +function download_link($pname) { + global $platforms; + global $url_base; $p = $platforms[$pname]; - if (!$p) { - error_page("platform not found"); - } - $long_name = $p["name"]; - $va = $p["versions"]; - foreach ($va as $v) { - if ($v['num'] == $version && $type_name==$v['type']) { - page_head("BOINC version $version for $long_name"); - show_detail($v); - page_tail(); - exit(); - } - } - error_page( "version not found\n"); + $v = latest_version($p); + $file = $v['file']; + $long_name = $p['name']; + $num = $v['num']; + $path = "dl/$file"; + $url = $url_base.$file; + $dlink = "$file"; + $s = number_format(filesize($path)/1000000, 2); + + return " +
+ Download BOINC +
+ $num for $long_name ($s MB) +
+ "; } -if ($xml) { - header('Content-type: text/xml'); - echo " - -"; - foreach($platforms as $short_name=>$p) { - show_platform_xml($short_name, $p, $dev); +function link_row($pname) { + echo ""; + if ($pname=='win') { + echo " Windows"; + } else if ($pname=='mac') { + echo " Mac OS X"; + } else if ($pname=='linux') { + echo " Linux"; } - echo "\n"; -} else { + echo ""; + echo download_link($pname); + echo " + "; +} + +function show_download($pname) { + echo " +
+ + BOINC is a program that lets you donate + your idle computer time to science projects like + SETI@home, Climateprediction.net, Rosetta@home, + World Community Grid, and many others. +

+ After installing BOINC on your computer, + you can connect it to as many of these projects as you like. +

+ "; if ($pname) { - $p = $platforms[$pname]; - $name = $p['name']; - page_head("Download BOINC client software for $name"); - echo ""; - show_platform($pname, $p, $dev); - list_end(); + echo download_link($pname); } else { - page_head("Download BOINC client software"); - echo " - We are now using mirrored download servers at partner institutions. - Your download will come from a randomly-chosen server. - Thanks to these partners for their help. -

- If you have trouble downloading a file, - please reload this page in your browser and try again. - This will link to a different download mirror and may - fix the problem. -

-

+ echo "
"; - foreach($platforms as $short_name=>$p) { - show_platform($short_name, $p, $dev); - } - list_end(); - echo " -

- If your computer is not of one of these types, you can -

- BOINC is not available for Mac OS 9 or earlier. - There are no plans to develop an OS 9 version. -

- The Windows BOINC client can be - deployed across a Windows network - using Active Directory. + link_row('win'); + link_row('mac'); + link_row('linux'); + echo "

"; } echo "

- Download information can be restricted by - platform and/or version number, - and can be obtained in XML format. - Details. + System requirements + | Release notes + "; + if ($pname) { + echo " | Other systems + "; + } else { + echo " | All versions + "; + } + echo "

"; - page_tail(); } +if ($_GET['xml']) { + Header("Location: download_all.php?xml=1"); + exit(); +} + +page_head("BOINC: compute for science"); + +if ($_GET['all_platforms']) { + show_download(null); +} else if (strstr($client_info, 'Windows')) { + show_download('win'); +} else if (strstr($client_info, 'Mac')) { + show_download('mac'); +} else if (strstr($client_info, 'Linux')) { + show_download('linux'); +} else { + show_download(null); +} +page_tail(); + ?> diff --git a/doc/index.php b/doc/index.php index f0353af990..379f1303fd 100644 --- a/doc/index.php +++ b/doc/index.php @@ -54,11 +54,12 @@ function show_participate() {

Use the idle time on your computer (Windows, Mac, or Linux) - to do all sorts of scientific research: + to do all sorts of scientific research. + It's easy:

    -
  1. Choose projects -
  2. Download and run BOINC software -
  3. Enter the projects' URLs, your email address, and password. +
  4. Choose projects +
  5. Download and run BOINC software +
  6. Enter the project URLs, your email address, and password.
Details diff --git a/doc/test_matrix.php b/doc/test_matrix.php index 02364ce161..534fb9525b 100644 --- a/doc/test_matrix.php +++ b/doc/test_matrix.php @@ -87,7 +87,10 @@ Verify that download resumes from the same point.
  • Test #processors preference.
  • Test 'use network between hours' preference.
  • Test 'do work between hours' preference. -
  • Test venue mechanism +
  • Test 'CPU usage limit' preference. +
  • Test venue mechanism (e.g., create preferences for 'Home', + change your computer's location to 'Home', + make sure it gets the right preferences).
  • Update a second project with same account email address, and make sure preferences are propagated to the second project. diff --git a/html/ops/remind_email/sample_failed_html b/html/ops/remind_email/sample_failed_html index 53633547e2..43669dfcec 100644 --- a/html/ops/remind_email/sample_failed_html +++ b/html/ops/remind_email/sample_failed_html @@ -1,35 +1,46 @@ - - + + + + + +
    + + + + + +
    +

    Dear :

    -We notice that you registered with Test Project on , +We notice that you registered with SETI@home on , and that we haven't yet credited you with any completed work. -Your computing power is important to Test Project. +Your computing power is important to SETI@home. If you had problems installing or running the software, -please visit the -Questions and Answers -area of our web site. +please visit +the Questions and Answers area +of our web site. You may find the solution to your problem there; if not, you can ask for help from project volunteers and staff.

    -We also encourage you to fill out the -BOINC user survey -to give us feedback on how to make Test Project more easy and fun to use. +We also encourage you to fill out +the BOINC user survey. +to give us feedback on how to make SETI@home easier to use.

    -Thanks -- -

    -The staff of Test Project +Thanks! -

    - -To not receive future emails from Test Project, +-- The SETI@home team + +

    +

    +If you'd like to not get any more email from us, please >click here. - - +

    + diff --git a/html/ops/remind_email/sample_failed_subject b/html/ops/remind_email/sample_failed_subject index 639a1b98ce..c32cd4a304 100644 --- a/html/ops/remind_email/sample_failed_subject +++ b/html/ops/remind_email/sample_failed_subject @@ -1 +1 @@ -Setup problems with Test Project +Need help setting up SETI@home? diff --git a/html/ops/remind_email/sample_failed_text b/html/ops/remind_email/sample_failed_text index 339bef1174..6d6f2c3b8d 100644 --- a/html/ops/remind_email/sample_failed_text +++ b/html/ops/remind_email/sample_failed_text @@ -1,20 +1,21 @@ Dear : -We notice that you registered with Test Project on , +We notice that you registered with SETI@home on , and that we haven't yet credited you with any completed work. -Your computing power is important to Test Project. +Your computing power is important to SETI@home. If you had problems installing or running the software, please visit the Questions and Answers area of our web site at: -http://a.b.c/forum_help_desk.php +http://setiathome.berkeley.edu/forum_help_desk.php You may find the solution to your problem there; if not, you can ask for help from project volunteers and staff. We also encourage you to fill out the BOINC user survey at http://boinc.berkeley.edu/poll.php -to give us feedback on how to make Test Project more easy and fun to use. +to give us feedback on how to make SETI@home easier to use. -Thanks -- -The staff of Test Project +Thanks! + +-- The SETI@home team If you'd like to not get any more email from us, please visit diff --git a/html/ops/remind_email/sample_lapsed_html b/html/ops/remind_email/sample_lapsed_html index 8a162759e1..aeee3fd72e 100644 --- a/html/ops/remind_email/sample_lapsed_html +++ b/html/ops/remind_email/sample_lapsed_html @@ -1,37 +1,72 @@ - - + + + + + +
    + + + + + +
    +

    Dear : +

    +We'd like to invite you to reconnect with SETI@home. +Our records show that you've been with SETI@home since , +but it's been days since you last returned a work unit. +We want you back, and here's why:

    -We notice that you've contributed computing power to Test Project, -but that we haven't yet credited you with any completed work -in the last days. -Your computing power is important to Test Project, -and we hope that you resume computing with us soon. -If you had problems running the software, -please visit the -Questions and Answers -area of our web site. +There are exciting times for SETI@home. +We recently installed a new SETI@home data recorder +at the Arecibo radio telescope in Puerto Rico. +This recorder is attached to a state-of-the-art multibeam receiver, +so we can now measure signals from 7 positions on the sky at once, +with greater sensitivity to weak signals compared to the data +from the flat feed antenna we've used since 1999. +Coupled with a new application, SETI@home Enhanced, +we've greatly increased the sensitivity of our data analysis, +and the likelihood that we'll find the first signs +of extraterrestrial life. +We're also testing a second application, Astropulse, +which will look for extremely short pulses of astronomical +(and possibly intelligent) origin. + +

    +With these new development comes an increase in required computing power, +for which we depend on people like you. +We hope you will consider signing back on with SETI@home, +and help in this wonderful scientific venture. + +

    +Whether or now you resume running SETI@home, +you can help us by filling out +a survey about the BOINC software used by SETI@home. +We want to make sure that SETI@home is easy to use for everyone, +and your comments will help us make this happen. + +

    +If you experienced problems running SETI@home, please visit +the Questions and Answers area of our web site. You may find the solution to your problem there; if not, you can ask for help from project volunteers and staff.

    -We also encourage you to fill out the -BOINC user survey -to give us feedback on how to make Test Project more easy and fun to use. +We thank you for your involvement in SETI@home, +and hope that you rejoin us in our search +for signals from other worlds.

    -Thanks -- -

    -The staff of Test Project +-- The SETI@home team + +

    -

    - -To not receive future emails from Test Project, +To not get any more email from SETI@home, please >click here. - - +

    diff --git a/html/ops/remind_email/sample_lapsed_subject b/html/ops/remind_email/sample_lapsed_subject index afc41c890b..56d42330da 100644 --- a/html/ops/remind_email/sample_lapsed_subject +++ b/html/ops/remind_email/sample_lapsed_subject @@ -1 +1 @@ -Test Project: we haven't heard from you recently +Please rejoin SETI@home diff --git a/html/ops/remind_email/sample_lapsed_text b/html/ops/remind_email/sample_lapsed_text index ff0ddcc517..ef1f07b81c 100644 --- a/html/ops/remind_email/sample_lapsed_text +++ b/html/ops/remind_email/sample_lapsed_text @@ -1,22 +1,49 @@ Dear : -We notice that you registered with Test Project on , -and that we haven't yet credited you with any completed work -in the last days. -Your computing power is important to Test Project, -and we hope that you resume computing with us soon. -If you had problems running the software, +We'd like to invite you to reconnect with SETI@home. +Our records show that you've been with SETI@home since , +but it's been days since you last returned a work unit. +We want you back, and here's why: + +There are exciting times for SETI@home. +We recently installed a new SETI@home data recorder +at the Arecibo radio telescope in Puerto Rico. +This recorder is attached to a state-of-the-art multibeam receiver, +so we can now measure signals from 7 positions on the sky at once, +with greater sensitivity to weak signals compared to the data +from the flat feed antenna we've used since 1999. +Coupled with a new application, SETI@home Enhanced, +we've greatly increased the sensitivity of our data analysis, +and the likelihood that we'll find the first signs +of extraterrestrial life. +We're also testing a second application, Astropulse, +which will look for extremely short pulses of astronomical +(and possibly intelligent) origin. + +With these new development comes an increase in required computing power, +for which we depend on people like you. +We hope you will consider signing back on with SETI@home, +and help in this wonderful scientific venture. + +Whether or now you resume running SETI@home, +you can help us by filling out a survey about the BOINC +software used by SETI@home; to do so, visit +http://boinc.berkeley.edu/poll.php +We want to make sure that SETI@home is easy to use for everyone, +and your comments will help us make this happen. + +If you experienced problems running SETI@home, please visit the Questions and Answers area of our web site at -http://a.b.c/forum_help_desk.php +http://setiathome.berkeley.edu/forum_help_desk.php You may find the solution to your problem there; if not, you can ask for help from project volunteers and staff. -We also encourage you to fill out the BOINC user survey at -http://boinc.berkeley.edu/poll.php -to give us feedback on how to make Test Project more easy and fun to use. +We thank you for your involvement in SETI@home, +and hope that you rejoin us in our search +for signals from other worlds. -Thanks -- -The staff of Test Project -To not get any more email from us, please visit +-- The SETI@home team + +To not get any more email from SETI@home, please visit diff --git a/html/ops/repair_validator_problem.php b/html/ops/repair_validator_problem.php index 6ec6124146..f01da6000b 100644 --- a/html/ops/repair_validator_problem.php +++ b/html/ops/repair_validator_problem.php @@ -1,5 +1,8 @@