From e8f9807a813e46810bfddb882a633291d22134f7 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 28 Jun 2007 03:46:06 +0000
Subject: [PATCH] - user web: host merge: consider CPUs compatible if both    
 are vendor "AuthenticAMD".

html/inc/
    host.inc

svn path=/trunk/boinc/; revision=13045
---
 checkin_notes     | 6 ++++++
 html/inc/host.inc | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 367ca5d8c3..bca5ad4aa0 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -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
diff --git a/html/inc/host.inc b/html/inc/host.inc
index 30cf001cb3..c6ae677742 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -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;