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

- user web: host merge: skip disjoint-time check 

if one of the hosts has zero credit

html/inc/
    host.inc

svn path=/trunk/boinc/; revision=13035
This commit is contained in:
David Anderson 2007-06-27 16:12:25 +00:00
parent fdf8973685
commit c9ac734ae9
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -6774,3 +6774,10 @@ Charlie 27 June 2007
app_start.C app_start.C
lib/ lib/
shmem.C shmem.C
David 27 June 2007
- user web: host merge: skip disjoint-time check
if one of the hosts has zero credit
html/inc/
host.inc

6
html/inc/host.inc
View File

@ -310,7 +310,11 @@ function times_disjoint($host1, $host2) {
// So the CPU/OS checks don't have to be very strict. // So the CPU/OS checks don't have to be very strict.
// //
function hosts_compatible($host1, $host2) { function hosts_compatible($host1, $host2) {
if (!times_disjoint($host1, $host2)) return false; // skip disjoint-time check if one host or other has no credit
//
if ($host1->total_credit && $host->total_credit) {
if (!times_disjoint($host1, $host2)) return false;
}
if ($host2->os_name != $host1->os_name) return false; if ($host2->os_name != $host1->os_name) return false;
if (!cpus_compatible($host1, $host2)) return false; if (!cpus_compatible($host1, $host2)) return false;
return true; return true;