diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 483642c60..3457c7c77 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -32,6 +32,7 @@ Servlet version: <%=getServletInfo()%>
JSTL version:
Platform: <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%>
+Jcpuid version: <%=freenet.support.CPUInformation.CPUID.getJcpuidVersion()%>
Processor: <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)
Jbigi: <%=net.i2p.util.NativeBigInteger.loadStatus()%>
Jbigi version: <%=net.i2p.util.NativeBigInteger.getJbigiVersion()%>
diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java index 046fcc05e..d23f4f23b 100644 --- a/core/java/src/freenet/support/CPUInformation/CPUID.java +++ b/core/java/src/freenet/support/CPUInformation/CPUID.java @@ -128,6 +128,15 @@ public class CPUID { } } + /** + * Return the jcpuid version + * @return 0 if no jcpuid available, 2 if version not supported + * @since 0.9.26 + */ + public static int getJcpuidVersion() { + return _jcpuidVersion; + } + static String getCPUVendorID() { CPUIDResult c = doCPUID(0);