From 03adda3bdeeaccefce0591dd20505b08c6043faa Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 28 Apr 2016 11:43:11 +0000
Subject: [PATCH] CPUID: Add version to /logs
---
apps/routerconsole/jsp/logs.jsp | 1 +
core/java/src/freenet/support/CPUInformation/CPUID.java | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index 483642c60b..3457c7c774 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 046fcc05e5..d23f4f23bb 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);
--
GitLab