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

-user web: when merging hosts, remove CPU capabilities before any other action. 

svn path=/trunk/boinc/; revision=13322
This commit is contained in:
Rytis Slatkevičius 2007-08-15 14:09:10 +00:00
parent 0e305ec1fe
commit d49cfa2a85
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
html/inc/host.inc
View File

@ -1,4 +1,5 @@
<?php <?php
$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit
require_once("../inc/credit.inc"); require_once("../inc/credit.inc");
@ -261,9 +262,21 @@ function cpus_compatible($host1, $host2) {
// we screwed around with Intel processor names, // we screwed around with Intel processor names,
// so count them as compatible if both contain "Intel" and "Pentium", // so count them as compatible if both contain "Intel" and "Pentium",
// and don't have conflicting clock rate info // and don't have conflicting clock rate info
//
$p1 = "$host1->p_vendor $host1->p_model"; // Get rid of cpu capabilities before check
$p2 = "$host2->p_vendor $host2->p_model"; $pos = strpos($host1->p_model, '[');
$host1pm = $host1->p_model;
if($pos) {
$host1pm = trim(substr($host1->p_model, 0, $pos));
}
$pos = strpos($host2->p_model, '[');
$host2pm = $host2->p_model;
if($pos) {
$host2pm = trim(substr($host2->p_model, 0, $pos));
}
$p1 = "$host1->p_vendor $host1pm";
$p1 = "$host2->p_vendor $host2pm";
if (strstr($p1, "Pentium") && strstr($p1, "Intel") if (strstr($p1, "Pentium") && strstr($p1, "Intel")
&& strstr($p2, "Pentium") && strstr($p2, "Intel") && strstr($p2, "Pentium") && strstr($p2, "Intel")
) { ) {
@ -281,17 +294,6 @@ function cpus_compatible($host1, $host2) {
// they're compatible if models are the same, // they're compatible if models are the same,
// or contents of [family/model/stepping] are the same // or contents of [family/model/stepping] are the same
//
$pos = strpos($host1->p_model, '[');
$host1pm = $host1->p_model;
if($pos) {
$host1pm = trim(substr($host1->p_model, 0, $pos));
}
$pos = strpos($host2->p_model, '[');
$host2pm = $host2->p_model;
if($pos) {
$host2pm = trim(substr($host2->p_model, 0, $pos));
}
if ($host1pm != $host2pm) return false; if ($host1pm != $host2pm) return false;
} }
return true; return true;