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

- client: amend checkin of 18 Feb to not request work if 

work buffer is above upper limit


svn path=/trunk/boinc/; revision=25335
This commit is contained in:
David Anderson 2012-02-24 16:42:38 +00:00
parent e5d3476e77
commit 08d7dcd6d9
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -2149,3 +2149,10 @@ Rom 24 Feb 2012
clientgui/ clientgui/
ViewWork.cpp ViewWork.cpp
David 24 Feb 2012
- client: amend checkin of 18 Feb to not request work if
work buffer is above upper limit
client/
work_fetch.cpp

2
client/work_fetch.cpp
View File

@ -222,6 +222,8 @@ PROJECT* RSC_WORK_FETCH::choose_project_hyst(bool enforce_hyst) {
if (enforce_hyst) { if (enforce_hyst) {
if (saturated_time > gstate.work_buf_min()) return NULL; if (saturated_time > gstate.work_buf_min()) return NULL;
} }
if (saturated_time > gstate.work_buf_total()) return NULL;
for (unsigned i=0; i<gstate.projects.size(); i++) { for (unsigned i=0; i<gstate.projects.size(); i++) {
PROJECT* p = gstate.projects[i]; PROJECT* p = gstate.projects[i];
if (!p->pwf.can_fetch_work) continue; if (!p->pwf.can_fetch_work) continue;

6
html/user/create_account_form.php
View File

@ -48,12 +48,10 @@ if (parse_bool($config, "disable_account_creation")) {
} }
$nwac = parse_bool($config, "no_web_account_creation"); $nwac = parse_bool($config, "no_web_account_creation");
if ($nwac) { if (!$nwac && !no_computing()) {
echo "<p> echo "<p>
<b>".tra("Don't use this form. Just run BOINC, select Add Project, and enter an email address and password.")."</b></p> <b>".tra("NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, select Add Project, and enter an email address and password.")."</b></p>
"; ";
page_tail();
exit();
} }
echo " echo "