CPUID: Add version to /logs

This commit is contained in:
zzz
2016-04-28 11:43:11 +00:00
parent da62a1114c
commit 03adda3bde
2 changed files with 10 additions and 0 deletions

View File

@@ -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>

View File

@@ -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);