Changeset 280ca2c


Ignore:
Timestamp:
Jun 6, 2016 12:12:16 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
63272d3
Parents:
126a4d8
Message:

CPUID: Add CLI output for new AMD tests
Add @since for new AMD methods

Location:
core/java/src/freenet/support/CPUInformation
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java

    r126a4d8 r280ca2c  
    4242    /**
    4343     * @return true if the CPU present in the machine is at least an 'k10' CPU
     44     * @since 0.9.26
    4445     */
    4546    public boolean IsK10Compatible();
     
    5051    /**
    5152     * @return true if the CPU present in the machine is at least an 'jaguar' CPU
     53     * @since 0.9.26
    5254     */
    5355        public boolean IsJaguarCompatible();
     
    5860    /**
    5961     * @return true if the CPU present in the machine is at least a 'piledriver' CPU
     62     * @since 0.9.26
    6063     */
    6164        public boolean IsPiledriverCompatible();
    6265    /**
    6366     * @return true if the CPU present in the machine is at least a 'steamroller' CPU
     67     * @since 0.9.26
    6468     */
    6569        public boolean IsSteamrollerCompatible();
    6670    /**
    6771     * @return true if the CPU present in the machine is at least a 'excavator' CPU
     72     * @since 0.9.26
    6873     */
    6974        public boolean IsExcavatorCompatible();
  • core/java/src/freenet/support/CPUInformation/CPUID.java

    r126a4d8 r280ca2c  
    377377        if(c instanceof IntelCPUInfo){
    378378            System.out.println("\n **Intel-info**");
    379             System.out.println("Is PII-compatible: "+((IntelCPUInfo)c).IsPentium2Compatible());
    380             System.out.println("Is PIII-compatible: "+((IntelCPUInfo)c).IsPentium3Compatible());
    381             System.out.println("Is PIV-compatible: "+((IntelCPUInfo)c).IsPentium4Compatible());
    382             System.out.println("Is Atom-compatible: "+((IntelCPUInfo)c).IsAtomCompatible());
     379            System.out.println("Is PII-compatible:       "+((IntelCPUInfo)c).IsPentium2Compatible());
     380            System.out.println("Is PIII-compatible:      "+((IntelCPUInfo)c).IsPentium3Compatible());
     381            System.out.println("Is PIV-compatible:       "+((IntelCPUInfo)c).IsPentium4Compatible());
     382            System.out.println("Is Atom-compatible:      "+((IntelCPUInfo)c).IsAtomCompatible());
    383383            System.out.println("Is Pentium M compatible: "+((IntelCPUInfo)c).IsPentiumMCompatible());
    384             System.out.println("Is Core2-compatible: "+((IntelCPUInfo)c).IsCore2Compatible());
    385             System.out.println("Is Corei-compatible: "+((IntelCPUInfo)c).IsCoreiCompatible());
    386             System.out.println("Is Sandy-compatible: "+((IntelCPUInfo)c).IsSandyCompatible());
    387             System.out.println("Is Ivy-compatible: "+((IntelCPUInfo)c).IsIvyCompatible());
    388             System.out.println("Is Haswell-compatible: "+((IntelCPUInfo)c).IsHaswellCompatible());
     384            System.out.println("Is Core2-compatible:     "+((IntelCPUInfo)c).IsCore2Compatible());
     385            System.out.println("Is Corei-compatible:     "+((IntelCPUInfo)c).IsCoreiCompatible());
     386            System.out.println("Is Sandy-compatible:     "+((IntelCPUInfo)c).IsSandyCompatible());
     387            System.out.println("Is Ivy-compatible:       "+((IntelCPUInfo)c).IsIvyCompatible());
     388            System.out.println("Is Haswell-compatible:   "+((IntelCPUInfo)c).IsHaswellCompatible());
    389389            System.out.println("Is Broadwell-compatible: "+((IntelCPUInfo)c).IsBroadwellCompatible());
    390390        }
    391391        if(c instanceof AMDCPUInfo){
    392392            System.out.println("\n **AMD-info**");
    393             System.out.println("Is K6-compatible: "+((AMDCPUInfo)c).IsK6Compatible());
    394             System.out.println("Is K6_2-compatible: "+((AMDCPUInfo)c).IsK6_2_Compatible());
    395             System.out.println("Is K6_3-compatible: "+((AMDCPUInfo)c).IsK6_3_Compatible());
    396             System.out.println("Is Geode-compatible: "+((AMDCPUInfo)c).IsGeodeCompatible());
    397             System.out.println("Is Athlon-compatible: "+((AMDCPUInfo)c).IsAthlonCompatible());
    398             System.out.println("Is Athlon64-compatible: "+((AMDCPUInfo)c).IsAthlon64Compatible());
    399             System.out.println("Is Bobcat-compatible: "+((AMDCPUInfo)c).IsBobcatCompatible());
     393            System.out.println("Is K6-compatible:          "+((AMDCPUInfo)c).IsK6Compatible());
     394            System.out.println("Is K6_2-compatible:        "+((AMDCPUInfo)c).IsK6_2_Compatible());
     395            System.out.println("Is K6_3-compatible:        "+((AMDCPUInfo)c).IsK6_3_Compatible());
     396            System.out.println("Is Geode-compatible:       "+((AMDCPUInfo)c).IsGeodeCompatible());
     397            System.out.println("Is Athlon-compatible:      "+((AMDCPUInfo)c).IsAthlonCompatible());
     398            System.out.println("Is Athlon64-compatible:    "+((AMDCPUInfo)c).IsAthlon64Compatible());
     399            System.out.println("Is Bobcat-compatible:      "+((AMDCPUInfo)c).IsBobcatCompatible());
     400            System.out.println("Is K10-compatible:         "+((AMDCPUInfo)c).IsK10Compatible());
     401            System.out.println("Is Jaguar-compatible:      "+((AMDCPUInfo)c).IsJaguarCompatible());
     402            System.out.println("Is Bulldozer-compatible:   "+((AMDCPUInfo)c).IsBulldozerCompatible());
     403            System.out.println("Is Piledriver-compatible:  "+((AMDCPUInfo)c).IsPiledriverCompatible());
     404            System.out.println("Is Steamroller-compatible: "+((AMDCPUInfo)c).IsSteamrollerCompatible());
     405            System.out.println("Is Excavator-compatible:   "+((AMDCPUInfo)c).IsExcavatorCompatible());
    400406        }
    401407    }
Note: See TracChangeset for help on using the changeset viewer.