[freenet-cvs] r14957 - trunk/freenet/src/freenet/support/CPUInformation

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-09-04 09:21:51 +0000 (Tue, 04 Sep 2007)
New Revision: 14957

Modified:
   trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
Log:
Resolve 74: Update CPUID - thanks to bobbie sanford ... I forgot about his patch :$

Modified: trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/CPUID.java	2007-09-03 23:57:49 UTC (rev 14956)
+++ trunk/freenet/src/freenet/support/CPUInformation/CPUID.java	2007-09-04 09:21:51 UTC (rev 14957)
@@ -233,15 +233,26 @@
 						return "Athlon (Barton)";
 				}
 			}
-			if(getCPUFamily() == 15){
-				if(getCPUExtendedFamily() == 0){
+			if(getCPUFamily() == 15){ // Must check Extended Family
+				if(getCPUExtendedFamily() == 0){ AMD K8
+					// Tgis just tells us socket type and chip die technology
+					// see BrandID both the ID and NN portions
+					// If you need to determine a specific chip brand
 					switch(getCPUModel()){
 						case 4:
 							return "Athlon 64";
 						case 5:
 							return "Athlon 64 FX Opteron";
+						case 7:
+							return "Athlon 64 (0.13 um 939)";
+						case 8:
+							return "Athlon 64 (0.13 um 754)";
+						case 11:
+							return "Athlon 64 (0.13 um 939)";
 						case 12:
-							return "AMD Athlon(tm) 64 Processor 3000+";
+							return "Athlon 64 (0.13 um 754)";
+						case 15:
+							return "Athlon 64 (0.13 um 939)";
 					}
 				}
 			}
@@ -373,6 +384,7 @@
 		System.out.println("**CPUInfo**");
 		System.out.println("CPU Vendor: " + getCPUVendorID());
 		System.out.println("CPU Family: " + getCPUFamily());
+		System.out.println("CPU Extended Family: " + getCPUExtendedFamily());
 		System.out.println("CPU Model: " + getCPUModel());
 		System.out.println("CPU Stepping: " + getCPUStepping());
 		System.out.println("CPU Flags: " + getCPUFlags());