- user web: host merge: consider CPUs compatible if both

are vendor "AuthenticAMD".

html/inc/
    host.inc

svn path=/trunk/boinc/; revision=13045
This commit is contained in:
David Anderson 2007-06-28 03:46:06 +00:00
parent 4da66bfaa8
commit e8f9807a81
2 changed files with 11 additions and 3 deletions

View File

@ -6826,3 +6826,9 @@ Rom 27 June 2007
diagnostics.C, .h
diagnostics_win.C
David 27 June 2007
- user web: host merge: consider CPUs compatible if both
are vendor "AuthenticAMD".
html/inc/
host.inc

View File

@ -274,6 +274,8 @@ function cpus_compatible($host1, $host2) {
} else {
return false;
}
} else if (strstr($p1, "AuthenticAMD") && strstr($p2, "AuthenticAMD")) {
return true;
} else {
if ($host2->p_vendor != $host1->p_vendor) return false;
@ -322,16 +324,16 @@ function hosts_compatible($host1, $host2) {
//
if ($host1->total_credit && $host->total_credit) {
if (!times_disjoint($host1, $host2)) {
//echo "<br>h2 $host2->create_time $host2->rpc_time";
echo "<br>h2 $host2->create_time $host2->rpc_time";
return false;
}
}
if (!os_compatible($host1, $host2)) {
//echo "<br>$host1->id $host2->id: name\n";
echo "<br>$host1->id $host2->id: name\n";
return false;
}
if (!cpus_compatible($host1, $host2)) {
//echo "<br>$host1->id $host2->id: cpu\n";
echo "<br>$host1->id $host2->id: cpu\n";
return false;
}
return true;