echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run identifyCPU() on static for cleaner code.

Browse Source
This commit is contained in:
dev
2011-06-09 09:00:04 +00:00
parent fd178f6ce5
commit 032faaeb73
1 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
core/java/src/freenet/support/CPUInformation/CPUID.java
View File

@ -198,7 +198,7 @@ public class CPUID {
protected abstract static class CPUIDCPUInfo protected abstract static class CPUIDCPUInfo
{ {
protected boolean isX64 = false; protected static boolean isX64 = false;
public String getVendor() public String getVendor()
{ {
@ -254,31 +254,28 @@ public class CPUID {
protected static String modelString = null; protected static String modelString = null;
protected static boolean hasBeenIdentified = false; protected static boolean hasBeenIdentified = false;
public boolean IsK6Compatible(){ identifyCPU(); return isK6Compatible; } public boolean IsK6Compatible(){ return isK6Compatible; }
public boolean IsK6_2_Compatible(){ identifyCPU(); return isK6_2_Compatible; } public boolean IsK6_2_Compatible(){ return isK6_2_Compatible; }
public boolean IsK6_3_Compatible(){ identifyCPU(); return isK6_3_Compatible; } public boolean IsK6_3_Compatible(){ return isK6_3_Compatible; }
public boolean IsAthlonCompatible(){ identifyCPU(); return isAthlonCompatible; } public boolean IsAthlonCompatible(){ return isAthlonCompatible; }
public boolean IsAthlon64Compatible(){ identifyCPU(); return isAthlon64Compatible; } public boolean IsAthlon64Compatible(){ return isAthlon64Compatible; }
public boolean IsBobcatCompatible(){ identifyCPU(); return isBobcatCompatible; } public boolean IsBobcatCompatible(){ return isBobcatCompatible; }
static
{
identifyCPU();
}
public String getCPUModelString() throws UnknownCPUException public String getCPUModelString() throws UnknownCPUException
{ {
identifyCPU();
if (modelString != null) if (modelString != null)
return modelString; return modelString;
throw new UnknownCPUException("Unknown AMD CPU; Family="+(getCPUFamily() + getCPUExtendedFamily())+", Model="+(getCPUModel() + getCPUExtendedModel())); throw new UnknownCPUException("Unknown AMD CPU; Family="+(getCPUFamily() + getCPUExtendedFamily())+", Model="+(getCPUModel() + getCPUExtendedModel()));
} }
/*
* Identifies CPU, can't be used in static constructor due to JNI conflicts.
* Has to be manually run after object initialisation.
*/
private synchronized void identifyCPU()
{
if (hasBeenIdentified)
return; // Don't identify twice
hasBeenIdentified = true;
private synchronized static void identifyCPU()
{
//AMD-family = getCPUFamily()+getCPUExtendedFamily() //AMD-family = getCPUFamily()+getCPUExtendedFamily()
//AMD-model = getCPUModel()+getCPUExtendedModel() //AMD-model = getCPUModel()+getCPUExtendedModel()
//i486 class (Am486, 5x86) //i486 class (Am486, 5x86)
@ -588,36 +585,30 @@ public class CPUID {
// If modelString != null, the cpu is considered correctly identified. // If modelString != null, the cpu is considered correctly identified.
protected static String modelString = null; protected static String modelString = null;
protected static boolean hasBeenIdentified = false;
public boolean IsPentiumCompatible(){ identifyCPU(); return isPentiumCompatible; } public boolean IsPentiumCompatible(){ return isPentiumCompatible; }
public boolean IsPentiumMMXCompatible(){ identifyCPU(); return isPentiumMMXCompatible; } public boolean IsPentiumMMXCompatible(){ return isPentiumMMXCompatible; }
public boolean IsPentium2Compatible(){ identifyCPU(); return isPentium2Compatible; } public boolean IsPentium2Compatible(){ return isPentium2Compatible; }
public boolean IsPentium3Compatible(){ identifyCPU(); return isPentium3Compatible; } public boolean IsPentium3Compatible(){ return isPentium3Compatible; }
public boolean IsPentium4Compatible(){ identifyCPU(); return isPentium4Compatible; } public boolean IsPentium4Compatible(){ return isPentium4Compatible; }
public boolean IsAtomCompatible(){ identifyCPU(); return isAtomCompatible; } public boolean IsAtomCompatible(){ return isAtomCompatible; }
public boolean IsCore2Compatible(){ identifyCPU(); return isCore2Compatible; } public boolean IsCore2Compatible(){ return isCore2Compatible; }
public boolean IsCoreiCompatible(){ identifyCPU(); return isCoreiCompatible; } public boolean IsCoreiCompatible(){ return isCoreiCompatible; }
static
{
identifyCPU();
}
public String getCPUModelString() throws UnknownCPUException public String getCPUModelString() throws UnknownCPUException
{ {
identifyCPU();
if (modelString != null) if (modelString != null)
return modelString; return modelString;
throw new UnknownCPUException("Unknown Intel CPU; Family="+getCPUFamily()+", Model="+getCPUModel()); throw new UnknownCPUException("Unknown Intel CPU; Family="+getCPUFamily()+", Model="+getCPUModel());
} }
/* private synchronized static void identifyCPU()
* Identifies CPU, can't be used as static due to JNI conflicts.
* Has to be manually run after object initialisation
*/
private synchronized void identifyCPU()
{ {
if (hasBeenIdentified)
return; // Don't identify twice
hasBeenIdentified = true;
if (getCPUExtendedModel() == 0){ if (getCPUExtendedModel() == 0){
if(getCPUFamily() == 4){ if(getCPUFamily() == 4){
switch(getCPUModel()){ switch(getCPUModel()){