diff --git a/doc/account.html b/doc/account.php similarity index 89% rename from doc/account.html rename to doc/account.php index e165c84bfd..c507913ec1 100644 --- a/doc/account.html +++ b/doc/account.php @@ -1,6 +1,7 @@ -
You can join a BOINC project as follows: @@ -9,7 +10,7 @@ You can join a BOINC project as follows: This involves filling out a form with
diff --git a/doc/backend_state.php b/doc/backend_state.php index 9878e1851a..cfe702544b 100644 --- a/doc/backend_state.php +++ b/doc/backend_state.php @@ -1,65 +1,97 @@ require_once("docutil.php"); -page_head("Work unit and results states"); +page_head("Workunit and result scheduling logic"); echo "
-The processing of workunits and results involves several independent activities. -To keep track of these activities, -workunit and result database records have several parameters and state fields, -and their processing can be expressed in terms of state machines. +Workunit and result database records have several state fields, +and their processing can be described in terms of state transitions. -
+Several workunits parameters are described +here. -
-Assignment: when send result; now + WU.delay_bound +list_item("file_delete_state", + " +
Result invariants: diff --git a/doc/client.html b/doc/client.php similarity index 96% rename from doc/client.html rename to doc/client.php index a4d8c02ec9..09a8e45664 100644 --- a/doc/client.html +++ b/doc/client.php @@ -1,8 +1,7 @@ -
-
The BOINC work manager program controls @@ -65,7 +64,7 @@ The work manager window has several tabs: Shows status and error messages. Messages can be sorted by project or time. You can control what messages are shown. - Messages are also written to a file "messages.txt". + Messages are also written to a file 'messages.txt'.
To remove a project: quit the client. -Then delete the file "account_PROJECT-URL.xml" +Then delete the file 'account_PROJECT-URL.xml' where PROJECT-URL is the project's URL. +"; +page_tail(); +?> diff --git a/doc/contact.html b/doc/contact.php similarity index 70% rename from doc/contact.html rename to doc/contact.php index d5ad803616..c15cd4d60b 100644 --- a/doc/contact.html +++ b/doc/contact.php @@ -1,4 +1,7 @@ -
The BOINC project is based at the Space Sciences Laboratory at the University of California, Berkeley. @@ -6,3 +9,6 @@ at the University of California, Berkeley. For inquiries about BOINC, please email the Project Director, Dr. David P. Anderson. +"; +page_tail(); +?> diff --git a/doc/create_project.php b/doc/create_project.php index e7b9b3bdf6..ca7b9a2399 100644 --- a/doc/create_project.php +++ b/doc/create_project.php @@ -18,10 +18,12 @@ BOINC's abstractions of data and computation.
Each project gives you credit for the computations your computers performs for the project. -These credits are used to generate web-site "leaderboards" showing +These credits are used to generate web-site 'leaderboards' showing individuals, teams, and categories (countries, CPU types, etc.) ranked by credit.
-BOINC's credit system is based on a "reference computer" that does +BOINC's credit system is based on a 'reference computer' that does
BOINC projects may export data describing teams, users and hosts. @@ -7,17 +9,17 @@ This data is exported in XML files that can be downloaded by HTTP from a designated server.
-The data is presented in several different "views": +The data is presented in several different 'views': teams ordered by credit, teams ordered by ID, etc. To increase the efficiency of data access, views are broken into a number of files, each containing a fixed number of records.
-The entries in a given file are in either "summary" or "detail" form. +The entries in a given file are in either 'summary' or 'detail' form. For example, the summary of a team gives its ID, name, and credit, while the detailed from also contains a list of its members.
-These files can be zipped or gzipped by passing the "-zip" or "-gzip" +These files can be zipped or gzipped by passing the '-zip' or '-gzip' command to the db_dump program.
The files are as follows: @@ -209,3 +211,6 @@ g%27%3E</name_html> <n_bwdown>57037.049858</n_bwdown> </host> +"; +page_tail(); +?> diff --git a/doc/file_xfer_policy.html b/doc/file_xfer_policy.html deleted file mode 100644 index ace30524df..0000000000 --- a/doc/file_xfer_policy.html +++ /dev/null @@ -1,4 +0,0 @@ -
diff --git a/doc/flow.php b/doc/flow.php deleted file mode 100644 index 69922f31ca..0000000000 --- a/doc/flow.php +++ /dev/null @@ -1,32 +0,0 @@ - -require_once("docutil.php"); -page_head("Work distribution"); -echo " -
-Results are not necessarily dispatched one at a time. -Instead, each participant host -maintains an estimate of the amount of work remaining -(i.e. the time until one of its processors will be idle). -Each host also -has two scheduling parameters, the high-water mark and the -low-water mark -(these are part of the host's 'preferences', discussed elsewhere). -
-Normally the work remaining is between the high- and low-water marks. -When the work remaining reaches the low-water mark, the core -client contacts one or more scheduling servers, -and attempts to get enough work to exceed the high-water mark. -The scheduling server sends a maximum of four weeks of work. -If a work unit is not feasible for a host -because it consumes too many system resources, -the scheduling server will not send that work unit. -
-The amount of work (measured in FP/int ops) sent in a single -scheduling RPC can be limited by the project, on a per-application basis. -
-This scheme allows hosts that are sporadically connected -(because they're portable or have modem-based connections) -to avoid becoming idle due to lack of work. -"; -page_tail(); -?> diff --git a/doc/index.html b/doc/index.html index 23cefdbbf9..1b1462e7e2 100644 --- a/doc/index.html +++ b/doc/index.html @@ -11,8 +11,8 @@
+ |
Overview of BOINC
@@ -34,7 +34,7 @@ Use BOINC to develop resource-intensive applications -Participating in BOINC projects +Participating in BOINC projects @@ -61,11 +61,11 @@ Help debug and enhance the BOINC software. Spanish -Contact us +Contact us |
-+ |
Status and newsWe have resumed the BOINC beta test. -Archived news +Archived news |
-There are currently no plans to do official BOINC releases -optimized for specific platforms. -Since BOINC uses so little -CPU time, the savings from this would be on the order of -CPU seconds per actual days. -
-Developers may compile -their own version of the BOINC client optimized for a specific platform. -
-Projects which use the BOINC infrastructure may release -their applications in optimized form. -Care should be taken -to ensure the optimized versions are sent only to the -proper processors. diff --git a/doc/participate.php b/doc/participate.php index 3cab386929..6839797fc6 100644 --- a/doc/participate.php +++ b/doc/participate.php @@ -3,13 +3,14 @@ require_once("docutil.php"); page_head("Participating in BOINC projects"); echo "
BOINC allows applications to exploit specific architectures, but places the burden of recognizing the architecture -on the application developer. +on the application.
In other words, if you want to make a version of your application diff --git a/doc/prefs.html b/doc/prefs.php similarity index 92% rename from doc/prefs.html rename to doc/prefs.php index 5902eaacda..5d3dabeb2e 100644 --- a/doc/prefs.html +++ b/doc/prefs.php @@ -1,6 +1,7 @@ -
You can specify preferences determining and limiting how BOINC uses your computers. @@ -48,14 +49,17 @@ a web interface at the project's web site.
-Your account with a project has a "default location" +Your account with a project has a 'default location' (home, work, or school). New computers registered to your account will be given the default location. You can change the location of an existing computer through the project's web site. +"; +page_tail(); +?> diff --git a/doc/result.php b/doc/result.php index 88ec75cb66..8262ac42f9 100644 --- a/doc/result.php +++ b/doc/result.php @@ -6,67 +6,59 @@ echo " A result describes an instance of a computation, either unstarted, in progress, or completed. The attributes of a result include: +"; +list_start(); +list_item( + "name", + "A text string, unique across all results in the project." +); +list_item( + "workunit name", "" +); +list_item("output files", + "A list of the names of the output files, + and the names by which the application refers to them." +); +list_item("server state", + "Values include: +
-The following attributes are defined after the result is completed: -
-Results are normally created using the -create_work utility. -
-The XML document listing the output files has the form:
-<file_info>...</file_info> -[ ... ] -<result> - <name>foobar</name> - <wu_name>blah</wu_name> - <exit_status>blah</exit_status> - <file_ref>...</file_ref> - [ ... ] -</result> --The components are: -
-The XML document describing the sizes and checksums of the output -files is just a list of <file_info> elements, with the -nbytes and md5_cksum fields present. -The project back end -must parse this field to find the locations and checksums of output files. +Additional attributes are defined after the result is completed: +"; +list_start(); +list_item("host", + "The host that executed the computation" +); +list_item("exit status", ""); +list_item("CPU time", + "The CPU time that was used." +); +list_item("output file info", + "The sizes and checksums of its output files" +); +list_item("stderr", + "The stderr output of the computation" +); +list_item("host", + "The host that was sent the result." +); +list_item("received time", + "The time when the result was received." +); +list_end(); +echo" "; page_tail(); ?> diff --git a/doc/result_file_delete.fig b/doc/result_file_delete.fig deleted file mode 100644 index 02db35c383..0000000000 --- a/doc/result_file_delete.fig +++ /dev/null @@ -1,121 +0,0 @@ -#FIG 3.2 -Landscape -Center -Inches -Letter -100.00 -Single --2 -1200 2 -0 32 #c7b696 -0 33 #effbff -0 34 #dfcba6 -0 35 #414141 -0 36 #868286 -0 37 #c7c3c7 -0 38 #e7e3e7 -0 39 #8e8e8e -0 40 #aeaaae -0 41 #515551 -0 42 #414141 -0 43 #868286 -0 44 #c7c3c7 -0 45 #868286 -0 46 #c7c3c7 -0 47 #e7e3e7 -0 48 #8e8e8e -0 49 #8e8e8e -0 50 #414141 -0 51 #868286 -0 52 #c7c3c7 -0 53 #e7e3e7 -0 54 #414141 -0 55 #868286 -0 56 #c7c3c7 -0 57 #e7e3e7 -0 58 #868286 -0 59 #c7c3c7 -0 60 #e7e3e7 -0 61 #c7b696 -0 62 #effbff -0 63 #dfcba6 -0 64 #c7b696 -0 65 #effbff -0 66 #dfcba6 -0 67 #aeaaae -0 68 #515551 -0 69 #8e8e8e -0 70 #414141 -0 71 #868286 -0 72 #c7c3c7 -0 73 #e7e3e7 -0 74 #414141 -0 75 #868286 -0 76 #c7c3c7 -0 77 #e7e3e7 -0 78 #868286 -0 79 #c7c3c7 -0 80 #e7e3e7 -0 81 #414141 -0 82 #868286 -0 83 #c7c3c7 -0 84 #414141 -0 85 #c7c3c7 -0 86 #e7e3e7 -0 87 #414141 -0 88 #868286 -0 89 #c7c3c7 -0 90 #8e8e8e -0 91 #414141 -0 92 #868286 -0 93 #c7c3c7 -0 94 #e7e3e7 -0 95 #414141 -0 96 #868286 -0 97 #c7c3c7 -0 98 #e7e3e7 -0 99 #bebebe -0 100 #515151 -0 101 #000049 -0 102 #797979 -0 103 #303430 -0 104 #414541 -0 105 #414141 -0 106 #868286 -0 107 #c7c3c7 -0 108 #e7e3e7 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 - 4950 1725 4950 2475 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 - 4950 2925 4950 3750 -2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 - 4575 2475 5325 2475 5325 2925 4575 2925 4575 2475 -2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 - 4500 3750 5400 3750 5400 4200 4500 4200 4500 3750 -2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 - 4575 5175 5400 5175 5400 5625 4575 5625 4575 5175 -2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 - 4500 3750 5400 3750 5400 4200 4500 4200 4500 3750 -2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5 - 4575 5175 5400 5175 5400 5625 4575 5625 4575 5175 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 1 2 - 0 0 1.00 60.00 120.00 - 5250 4200 5250 5175 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 0 0 1.00 60.00 120.00 - 5100 4200 5100 5175 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 1 4 - 0 0 1.00 60.00 120.00 - 4500 3975 2025 3975 2025 5400 4575 5400 -4 0 0 50 0 16 12 0.0000 4 135 435 5100 2100 initial\001 -4 0 0 50 0 16 12 0.0000 4 135 330 4800 2775 INIT\001 -4 0 0 50 0 16 12 0.0000 4 135 645 4650 4050 READY\001 -4 0 0 50 0 16 12 0.0000 4 135 540 4725 5475 DONE\001 -4 0 0 50 0 16 12 0.0000 4 180 3870 5100 3150 scheduler: got reply and server_state = OVER\001 -4 0 0 50 0 16 12 0.0000 4 165 3015 5100 3375 timeout_check: all results are OVER\001 -4 0 0 50 0 16 12 0.0000 4 135 4815 5100 3600 assimilator: all results are OVER or result is not canonical\001 -4 0 0 50 0 16 12 0.0000 4 180 3870 525 3825 scheduler: got reply and server_state = OVER\001 -4 0 0 50 0 16 12 0.0000 4 165 2550 2475 4950 file_deleter: tried to delete files\001 -4 0 0 50 0 16 12 0.0000 4 180 3870 5400 4500 scheduler: get reply and server_state = OVER\001 diff --git a/doc/result_file_delete.png b/doc/result_file_delete.png deleted file mode 100644 index eb0f79b280..0000000000 Binary files a/doc/result_file_delete.png and /dev/null differ diff --git a/doc/result_process.html b/doc/result_process.html deleted file mode 100644 index 609084ebc1..0000000000 --- a/doc/result_process.html +++ /dev/null @@ -1,2 +0,0 @@ -
-Overrun of data server +Denial of server attacks on data servers
Each result file has an associated maximum size. Each project has a @@ -92,7 +92,8 @@ ensures that the amount of data uploaded does not exceed the maximum size.
Theft of participant account information by server attack
-Each project must address this using conventional security practices. +Each project must address theft of private account information +(e.g. email addresses) using conventional security practices. All server machines should be protected by a firewall, and should have all unused network services disabled. Access to these machines should be done only with encrypted protocols like SSH. @@ -105,6 +106,10 @@ attack could discredit all BOINC-based projects, and public-participation computing in general.
Theft of participant account information by network attack +Attackers sniffing network traffic could get user's account IDs, +and use them to get the user's email address, +or change the user's preferences. +
Theft of project files
diff --git a/doc/startup.html b/doc/startup.php similarity index 91% rename from doc/startup.html rename to doc/startup.php index 0d7c792ec0..927e93db51 100644 --- a/doc/startup.html +++ b/doc/startup.php @@ -1,6 +1,7 @@ -
You can join a second and subsequent projects as follows. @@ -35,3 +36,6 @@ In this case it may be necessary to edit preferences at different sites. To avoid overwriting edits, wait until previous edits have propagated to a site before editing preferences there. +"; +page_tail(); +?> diff --git a/doc/teams.html b/doc/teams.php similarity index 93% rename from doc/teams.html rename to doc/teams.php index eab9acc784..47e80f4d49 100644 --- a/doc/teams.html +++ b/doc/teams.php @@ -1,5 +1,7 @@ -
Participants in a project can form teams. @@ -41,3 +43,6 @@ The founder of a team has some additional capabilities:
-The program lib/crypt_prog can be used for several purposes:
-
-
-The create_work utility program provides a -simplified interface for creating workunits. +BOINC provides a utility program and C function +for creating workunits. "; page_tail(); diff --git a/doc/work_buffer.php b/doc/work_buffer.php new file mode 100644 index 0000000000..c382d9e470 --- /dev/null +++ b/doc/work_buffer.php @@ -0,0 +1,24 @@ + +require_once("docutil.php"); +page_head("Work buffering"); +echo " +
+Each BOINC client +maintains an estimate of the amount of work remaining +(i.e. the time until one of its processors will be idle). +Each host also has two preferences: +the minimum work and the +maximum work +(these are part of your 'general preferences', discussed elsewhere). +
+Normally the work remaining is between these two limits. +When the work remaining reaches minimum level, +the client contacts one or more scheduling servers, +and attempts to get enough work to exceed the maximum level. +
+This scheme allows hosts that are sporadically connected
+(because they're portable or have modem-based connections)
+to avoid becoming idle due to lack of work.
+";
+page_tail();
+?>
diff --git a/doc/wu_assimilate.fig b/doc/wu_assimilate.fig
deleted file mode 100644
index b03a2b21e0..0000000000
--- a/doc/wu_assimilate.fig
+++ /dev/null
@@ -1,112 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-0 32 #c7b696
-0 33 #effbff
-0 34 #dfcba6
-0 35 #414141
-0 36 #868286
-0 37 #c7c3c7
-0 38 #e7e3e7
-0 39 #8e8e8e
-0 40 #aeaaae
-0 41 #515551
-0 42 #414141
-0 43 #868286
-0 44 #c7c3c7
-0 45 #868286
-0 46 #c7c3c7
-0 47 #e7e3e7
-0 48 #8e8e8e
-0 49 #8e8e8e
-0 50 #414141
-0 51 #868286
-0 52 #c7c3c7
-0 53 #e7e3e7
-0 54 #414141
-0 55 #868286
-0 56 #c7c3c7
-0 57 #e7e3e7
-0 58 #868286
-0 59 #c7c3c7
-0 60 #e7e3e7
-0 61 #c7b696
-0 62 #effbff
-0 63 #dfcba6
-0 64 #c7b696
-0 65 #effbff
-0 66 #dfcba6
-0 67 #aeaaae
-0 68 #515551
-0 69 #8e8e8e
-0 70 #414141
-0 71 #868286
-0 72 #c7c3c7
-0 73 #e7e3e7
-0 74 #414141
-0 75 #868286
-0 76 #c7c3c7
-0 77 #e7e3e7
-0 78 #868286
-0 79 #c7c3c7
-0 80 #e7e3e7
-0 81 #414141
-0 82 #868286
-0 83 #c7c3c7
-0 84 #414141
-0 85 #c7c3c7
-0 86 #e7e3e7
-0 87 #414141
-0 88 #868286
-0 89 #c7c3c7
-0 90 #8e8e8e
-0 91 #414141
-0 92 #868286
-0 93 #c7c3c7
-0 94 #e7e3e7
-0 95 #414141
-0 96 #868286
-0 97 #c7c3c7
-0 98 #e7e3e7
-0 99 #bebebe
-0 100 #515151
-0 101 #000049
-0 102 #797979
-0 103 #303430
-0 104 #414541
-0 105 #414141
-0 106 #868286
-0 107 #c7c3c7
-0 108 #e7e3e7
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 1725 4950 2475
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 2925 4950 3750
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 2475 5325 2475 5325 2925 4575 2925 4575 2475
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4500 3750 5400 3750 5400 4200 4500 4200 4500 3750
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 5175 5400 5175 5400 5625 4575 5625 4575 5175
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4500 3750 5400 3750 5400 4200 4500 4200 4500 3750
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 5175 5400 5175 5400 5625 4575 5625 4575 5175
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 4200 4950 5175
-4 0 0 50 0 16 12 0.0000 4 135 435 5100 2100 initial\001
-4 0 0 50 0 16 12 0.0000 4 135 330 4800 2775 INIT\001
-4 0 0 50 0 16 12 0.0000 4 135 645 4650 4050 READY\001
-4 0 0 50 0 16 12 0.0000 4 135 540 4725 5475 DONE\001
-4 0 0 50 0 16 12 0.0000 4 135 1395 5100 4650 assimilator: done\001
-4 0 0 50 0 16 12 0.0000 4 135 2625 5100 3525 validate: found canonical result\001
-4 0 0 50 0 16 12 0.0000 4 165 2400 5100 3225 timeout_check: WU has error\001
diff --git a/doc/wu_assimilate.png b/doc/wu_assimilate.png
deleted file mode 100644
index e53ec98f99..0000000000
Binary files a/doc/wu_assimilate.png and /dev/null differ
diff --git a/doc/wu_error_mask.fig b/doc/wu_error_mask.fig
deleted file mode 100644
index 88bed2296a..0000000000
--- a/doc/wu_error_mask.fig
+++ /dev/null
@@ -1,113 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-0 32 #c7b696
-0 33 #effbff
-0 34 #dfcba6
-0 35 #414141
-0 36 #868286
-0 37 #c7c3c7
-0 38 #e7e3e7
-0 39 #8e8e8e
-0 40 #aeaaae
-0 41 #515551
-0 42 #414141
-0 43 #868286
-0 44 #c7c3c7
-0 45 #868286
-0 46 #c7c3c7
-0 47 #e7e3e7
-0 48 #8e8e8e
-0 49 #8e8e8e
-0 50 #414141
-0 51 #868286
-0 52 #c7c3c7
-0 53 #e7e3e7
-0 54 #414141
-0 55 #868286
-0 56 #c7c3c7
-0 57 #e7e3e7
-0 58 #868286
-0 59 #c7c3c7
-0 60 #e7e3e7
-0 61 #c7b696
-0 62 #effbff
-0 63 #dfcba6
-0 64 #c7b696
-0 65 #effbff
-0 66 #dfcba6
-0 67 #aeaaae
-0 68 #515551
-0 69 #8e8e8e
-0 70 #414141
-0 71 #868286
-0 72 #c7c3c7
-0 73 #e7e3e7
-0 74 #414141
-0 75 #868286
-0 76 #c7c3c7
-0 77 #e7e3e7
-0 78 #868286
-0 79 #c7c3c7
-0 80 #e7e3e7
-0 81 #414141
-0 82 #868286
-0 83 #c7c3c7
-0 84 #414141
-0 85 #c7c3c7
-0 86 #e7e3e7
-0 87 #414141
-0 88 #868286
-0 89 #c7c3c7
-0 90 #8e8e8e
-0 91 #414141
-0 92 #868286
-0 93 #c7c3c7
-0 94 #e7e3e7
-0 95 #414141
-0 96 #868286
-0 97 #c7c3c7
-0 98 #e7e3e7
-0 99 #bebebe
-0 100 #515151
-0 101 #000049
-0 102 #797979
-0 103 #303430
-0 104 #414541
-0 105 #414141
-0 106 #868286
-0 107 #c7c3c7
-0 108 #e7e3e7
-6 4575 5175 6375 5625
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 5175 6375 5175 6375 5625 4575 5625 4575 5175
-4 0 0 50 0 16 12 0.0000 4 165 1500 4725 5475 COULDNT_SEND\001
--6
-6 4500 3750 7500 4200
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4500 3750 7500 3750 7500 4200 4500 4200 4500 3750
-4 0 0 50 0 16 12 0.0000 4 165 2730 4650 4050 TOO_MANY_ERROR_RESULTS\001
--6
-6 4650 2475 6975 2925
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4650 2475 6975 2475 6975 2925 4650 2925 4650 2475
-4 0 0 50 0 16 12 0.0000 4 165 1995 4800 2775 TOO_MANY_RESULTS\001
--6
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 2100 4950 2475
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 3300 4950 3750
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 4650 4950 5175
-4 0 0 50 0 16 12 0.0000 4 180 3120 5100 3525 timeout_check: too many error results\001
-4 0 0 50 0 16 12 0.0000 4 180 2670 5100 2325 timeout_check: too many results\001
-4 0 0 50 0 16 12 0.0000 4 165 4980 5100 4950 timeout_check: some result has outcome=COULDNT_SEND\001
diff --git a/doc/wu_error_mask.png b/doc/wu_error_mask.png
deleted file mode 100644
index 9a59f1f7ef..0000000000
Binary files a/doc/wu_error_mask.png and /dev/null differ
diff --git a/doc/wu_file_delete.fig b/doc/wu_file_delete.fig
deleted file mode 100644
index 88883e9521..0000000000
--- a/doc/wu_file_delete.fig
+++ /dev/null
@@ -1,112 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-0 32 #c7b696
-0 33 #effbff
-0 34 #dfcba6
-0 35 #414141
-0 36 #868286
-0 37 #c7c3c7
-0 38 #e7e3e7
-0 39 #8e8e8e
-0 40 #aeaaae
-0 41 #515551
-0 42 #414141
-0 43 #868286
-0 44 #c7c3c7
-0 45 #868286
-0 46 #c7c3c7
-0 47 #e7e3e7
-0 48 #8e8e8e
-0 49 #8e8e8e
-0 50 #414141
-0 51 #868286
-0 52 #c7c3c7
-0 53 #e7e3e7
-0 54 #414141
-0 55 #868286
-0 56 #c7c3c7
-0 57 #e7e3e7
-0 58 #868286
-0 59 #c7c3c7
-0 60 #e7e3e7
-0 61 #c7b696
-0 62 #effbff
-0 63 #dfcba6
-0 64 #c7b696
-0 65 #effbff
-0 66 #dfcba6
-0 67 #aeaaae
-0 68 #515551
-0 69 #8e8e8e
-0 70 #414141
-0 71 #868286
-0 72 #c7c3c7
-0 73 #e7e3e7
-0 74 #414141
-0 75 #868286
-0 76 #c7c3c7
-0 77 #e7e3e7
-0 78 #868286
-0 79 #c7c3c7
-0 80 #e7e3e7
-0 81 #414141
-0 82 #868286
-0 83 #c7c3c7
-0 84 #414141
-0 85 #c7c3c7
-0 86 #e7e3e7
-0 87 #414141
-0 88 #868286
-0 89 #c7c3c7
-0 90 #8e8e8e
-0 91 #414141
-0 92 #868286
-0 93 #c7c3c7
-0 94 #e7e3e7
-0 95 #414141
-0 96 #868286
-0 97 #c7c3c7
-0 98 #e7e3e7
-0 99 #bebebe
-0 100 #515151
-0 101 #000049
-0 102 #797979
-0 103 #303430
-0 104 #414541
-0 105 #414141
-0 106 #868286
-0 107 #c7c3c7
-0 108 #e7e3e7
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 1725 4950 2475
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 2925 4950 3750
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 2475 5325 2475 5325 2925 4575 2925 4575 2475
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4500 3750 5400 3750 5400 4200 4500 4200 4500 3750
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 5175 5400 5175 5400 5625 4575 5625 4575 5175
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4500 3750 5400 3750 5400 4200 4500 4200 4500 3750
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 5175 5400 5175 5400 5625 4575 5625 4575 5175
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 4200 4950 5175
-4 0 0 50 0 16 12 0.0000 4 135 435 5100 2100 initial\001
-4 0 0 50 0 16 12 0.0000 4 135 330 4800 2775 INIT\001
-4 0 0 50 0 16 12 0.0000 4 135 645 4650 4050 READY\001
-4 0 0 50 0 16 12 0.0000 4 135 540 4725 5475 DONE\001
-4 0 0 50 0 16 12 0.0000 4 165 6960 5100 3150 timeout_check: all results have server_state=OVER and wu.assimilate_state=DONE\001
-4 0 0 50 0 16 12 0.0000 4 180 6690 5100 3375 assimilate: all results have server_state=OVER (and wu.assimilate_state=DONE)\001
-4 0 0 50 0 16 12 0.0000 4 165 2550 2250 4725 file_deleter: tried to delete files\001
diff --git a/doc/wu_file_delete.png b/doc/wu_file_delete.png
deleted file mode 100644
index 7a977eb1f6..0000000000
Binary files a/doc/wu_file_delete.png and /dev/null differ
diff --git a/doc/wu_need_validate.fig b/doc/wu_need_validate.fig
deleted file mode 100644
index d97d749d3f..0000000000
--- a/doc/wu_need_validate.fig
+++ /dev/null
@@ -1,106 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-0 32 #c7b696
-0 33 #effbff
-0 34 #dfcba6
-0 35 #414141
-0 36 #868286
-0 37 #c7c3c7
-0 38 #e7e3e7
-0 39 #8e8e8e
-0 40 #aeaaae
-0 41 #515551
-0 42 #414141
-0 43 #868286
-0 44 #c7c3c7
-0 45 #868286
-0 46 #c7c3c7
-0 47 #e7e3e7
-0 48 #8e8e8e
-0 49 #8e8e8e
-0 50 #414141
-0 51 #868286
-0 52 #c7c3c7
-0 53 #e7e3e7
-0 54 #414141
-0 55 #868286
-0 56 #c7c3c7
-0 57 #e7e3e7
-0 58 #868286
-0 59 #c7c3c7
-0 60 #e7e3e7
-0 61 #c7b696
-0 62 #effbff
-0 63 #dfcba6
-0 64 #c7b696
-0 65 #effbff
-0 66 #dfcba6
-0 67 #aeaaae
-0 68 #515551
-0 69 #8e8e8e
-0 70 #414141
-0 71 #868286
-0 72 #c7c3c7
-0 73 #e7e3e7
-0 74 #414141
-0 75 #868286
-0 76 #c7c3c7
-0 77 #e7e3e7
-0 78 #868286
-0 79 #c7c3c7
-0 80 #e7e3e7
-0 81 #414141
-0 82 #868286
-0 83 #c7c3c7
-0 84 #414141
-0 85 #c7c3c7
-0 86 #e7e3e7
-0 87 #414141
-0 88 #868286
-0 89 #c7c3c7
-0 90 #8e8e8e
-0 91 #414141
-0 92 #868286
-0 93 #c7c3c7
-0 94 #e7e3e7
-0 95 #414141
-0 96 #868286
-0 97 #c7c3c7
-0 98 #e7e3e7
-0 99 #bebebe
-0 100 #515151
-0 101 #000049
-0 102 #797979
-0 103 #303430
-0 104 #414541
-0 105 #414141
-0 106 #868286
-0 107 #c7c3c7
-0 108 #e7e3e7
-6 4500 4050 5400 4500
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4500 4050 5400 4050 5400 4500 4500 4500 4500 4050
-4 0 0 50 0 16 12 0.0000 4 135 465 4650 4350 TRUE\001
--6
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 1725 4950 2475
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 2475 5325 2475 5325 2925 4575 2925 4575 2475
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4800 2925 4800 4050
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 0 1 2
- 0 0 1.00 60.00 120.00
- 5175 2925 5175 4050
-4 0 0 50 0 16 12 0.0000 4 135 435 5100 2100 initial\001
-4 0 0 50 0 16 12 0.0000 4 135 600 4650 2775 FALSE\001
-4 0 0 50 0 16 12 0.0000 4 180 3660 975 3525 scheduler: got reply with client_state DONE\001
-4 0 0 50 0 16 12 0.0000 4 180 2010 5400 3525 validate: done checking\001
diff --git a/doc/wu_need_validate.png b/doc/wu_need_validate.png
deleted file mode 100644
index b8abb3972d..0000000000
Binary files a/doc/wu_need_validate.png and /dev/null differ
diff --git a/doc/wu_timeout.fig b/doc/wu_timeout.fig
deleted file mode 100644
index 2ce69ee719..0000000000
--- a/doc/wu_timeout.fig
+++ /dev/null
@@ -1,108 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-0 32 #c7b696
-0 33 #effbff
-0 34 #dfcba6
-0 35 #414141
-0 36 #868286
-0 37 #c7c3c7
-0 38 #e7e3e7
-0 39 #8e8e8e
-0 40 #aeaaae
-0 41 #515551
-0 42 #414141
-0 43 #868286
-0 44 #c7c3c7
-0 45 #868286
-0 46 #c7c3c7
-0 47 #e7e3e7
-0 48 #8e8e8e
-0 49 #8e8e8e
-0 50 #414141
-0 51 #868286
-0 52 #c7c3c7
-0 53 #e7e3e7
-0 54 #414141
-0 55 #868286
-0 56 #c7c3c7
-0 57 #e7e3e7
-0 58 #868286
-0 59 #c7c3c7
-0 60 #e7e3e7
-0 61 #c7b696
-0 62 #effbff
-0 63 #dfcba6
-0 64 #c7b696
-0 65 #effbff
-0 66 #dfcba6
-0 67 #aeaaae
-0 68 #515551
-0 69 #8e8e8e
-0 70 #414141
-0 71 #868286
-0 72 #c7c3c7
-0 73 #e7e3e7
-0 74 #414141
-0 75 #868286
-0 76 #c7c3c7
-0 77 #e7e3e7
-0 78 #868286
-0 79 #c7c3c7
-0 80 #e7e3e7
-0 81 #414141
-0 82 #868286
-0 83 #c7c3c7
-0 84 #414141
-0 85 #c7c3c7
-0 86 #e7e3e7
-0 87 #414141
-0 88 #868286
-0 89 #c7c3c7
-0 90 #8e8e8e
-0 91 #414141
-0 92 #868286
-0 93 #c7c3c7
-0 94 #e7e3e7
-0 95 #414141
-0 96 #868286
-0 97 #c7c3c7
-0 98 #e7e3e7
-0 99 #bebebe
-0 100 #515151
-0 101 #000049
-0 102 #797979
-0 103 #303430
-0 104 #414541
-0 105 #414141
-0 106 #868286
-0 107 #c7c3c7
-0 108 #e7e3e7
-6 4275 2475 5625 2925
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4275 2475 5625 2475 5625 2925 4275 2925 4275 2475
-4 0 0 50 0 16 12 0.0000 4 135 945 4425 2775 NONZERO\001
--6
-6 4575 4050 5325 4500
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
- 4575 4050 5325 4050 5325 4500 4575 4500 4575 4050
-4 0 0 50 0 16 12 0.0000 4 135 525 4650 4350 ZERO\001
--6
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4950 1725 4950 2475
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 4800 2925 4800 4050
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 4
- 0 0 1.00 60.00 120.00
- 5625 2550 6225 2550 6225 2850 5625 2850
-4 0 0 50 0 16 12 0.0000 4 135 435 5100 2100 initial\001
-4 0 0 50 0 16 12 0.0000 4 165 2100 6375 2775 timeout_check: otherwise\001
-4 0 0 50 0 16 12 0.0000 4 165 5250 5025 3525 timeout_check: all results are OVER and validate_state=DONE\001
diff --git a/doc/wu_timeout.png b/doc/wu_timeout.png
deleted file mode 100644
index 8b1c38caf8..0000000000
Binary files a/doc/wu_timeout.png and /dev/null differ
diff --git a/sched/validate.C b/sched/validate.C
index 989525bd48..266d37cd7b 100644
--- a/sched/validate.C
+++ b/sched/validate.C
@@ -116,13 +116,9 @@ void handle_wu(DB_WORKUNIT& wu) {
}
// scan this WU's results, and check the unchecked ones
+ // TODO: do we have an index on these fields?
+ // maybe better just to enum on workunitid
//
- // sprintf(buf, "where workunitid=%d", wu.id);
- // while (!result.enumerate(buf)) {
- // if (result.validate_state == VALIDATE_STATE_INIT
- // && result.server_state == RESULT_SERVER_STATE_OVER
- // && result.outcome == RESULT_OUTCOME_SUCCESS
- // ) {
sprintf(buf, "where workunitid=%d and validate_state=%d and server_state=%d and outcome=%d",
wu.id, VALIDATE_STATE_INIT, RESULT_SERVER_STATE_OVER, RESULT_OUTCOME_SUCCESS
);
@@ -192,6 +188,8 @@ void handle_wu(DB_WORKUNIT& wu) {
++log_messages;
// sprintf(buf, "where workunitid=%d", wu.id);
+ // TODO: do we have an index on these fields?
+ // maybe better to enum on workunitid
// while (!result.enumerate(buf)) {
// if (result.server_state == RESULT_SERVER_STATE_OVER
// && result.outcome == RESULT_OUTCOME_SUCCESS
diff --git a/sched/validate_util.C b/sched/validate_util.C
index 78565b0600..c9e420e3d8 100644
--- a/sched/validate_util.C
+++ b/sched/validate_util.C
@@ -46,8 +46,7 @@ int get_output_file_path(RESULT const& result, string& path) {
// - if N==2, give min credit
// - if N>2, toss out min and max, give average of rest
//
-double median_mean_credit(vector