diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 483642c60b2bc5932ef0ed3526593badbde0ca4c..3457c7c7748f8f1d1f0c722b7edd3a24ea4bb5b5 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -32,6 +32,7 @@ <b>Servlet version:</b> <%=getServletInfo()%><br> <b>JSTL version:</b> <jsp:getProperty name="logsHelper" property="jstlVersion" /><br> <b>Platform:</b> <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br> +<b>Jcpuid version:</b> <%=freenet.support.CPUInformation.CPUID.getJcpuidVersion()%><br> <b>Processor:</b> <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br> <b>Jbigi:</b> <%=net.i2p.util.NativeBigInteger.loadStatus()%><br> <b>Jbigi version:</b> <%=net.i2p.util.NativeBigInteger.getJbigiVersion()%><br> diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java index 046fcc05e59792c8f87766e2f11dadf80bb56bbb..d23f4f23bb3382ac3c7f0ff7e8333c9a7b13c7a5 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);