From eb94d4190cc3d9e1c40e72b4397dfff94c3e746f Mon Sep 17 00:00:00 2001
From: Wim Brand <fornax@fornaxian.com>
Date: Mon, 9 Nov 2020 12:27:55 +0100
Subject: [PATCH] pixelstore stats per second

---
 res/include/script/admin.js     | 28 +++++++++++++++++-----
 res/template/admin.html         | 42 +++++++++++++++++----------------
 webcontroller/web_controller.go |  1 -
 3 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/res/include/script/admin.js b/res/include/script/admin.js
index 5d48209..aec966a 100644
--- a/res/include/script/admin.js
+++ b/res/include/script/admin.js
@@ -174,7 +174,13 @@ function navigateTimespan(forward) {
 
 // Load performance statistics
 
-let lastOrder
+let last_update = new Date().getTime();
+let last_local_reads = 0;
+let last_local_read_size = 0;
+let last_remote_reads = 0;
+let last_remote_read_size = 0;
+
+let lastOrder;
 function getStats(order) {
 	lastOrder = order
 
@@ -187,12 +193,22 @@ function getStats(order) {
 			resp.stats_watcher_listeners / resp.stats_watcher_threads
 		).toPrecision(3);
 
-		document.getElementById("cache_files").innerText = resp.cache_files;
-		document.getElementById("cache_size").innerText = formatDataVolume(resp.cache_size_total, 3);
-		document.getElementById("cache_max").innerText = formatDataVolume(resp.cache_size_max, 3);
-		document.getElementById("cache_reads").innerText = resp.cache_reads;
-		document.getElementById("disk_reads").innerText = resp.disk_reads;
+		let elapsed = (new Date().getTime() - last_update) / 1000;
+		document.getElementById("local_reads").innerText = resp.local_reads;
+		document.getElementById("local_read_size").innerText = formatDataVolume(resp.local_read_size, 4);
 		document.getElementById("remote_reads").innerText = resp.remote_reads;
+		document.getElementById("remote_read_size").innerText = formatDataVolume(resp.remote_read_size, 4);
+		document.getElementById("local_reads_rate").innerText = ((resp.local_reads - last_local_reads) / elapsed).toPrecision(4) + " / s";
+		document.getElementById("local_read_size_rate").innerText = formatDataVolume((resp.local_read_size - last_local_read_size) / elapsed, 4) + " / s";
+		document.getElementById("remote_reads_rate").innerText = ((resp.remote_reads - last_remote_reads) / elapsed).toPrecision(4) + " / s";
+		document.getElementById("remote_read_size_rate").innerText = formatDataVolume((resp.remote_read_size - last_remote_read_size) / elapsed, 4) + " / s";
+
+		last_update = new Date().getTime();
+		last_local_reads = resp.local_reads;
+		last_local_read_size = resp.local_read_size;
+		last_remote_reads = resp.remote_reads;
+		last_remote_read_size = resp.remote_read_size;
+
 
 		let c = document.getElementById("tconnstat_body")
 		c.innerHTML = ""
diff --git a/res/template/admin.html b/res/template/admin.html
index 58895e5..37e5bb2 100644
--- a/res/template/admin.html
+++ b/res/template/admin.html
@@ -83,26 +83,28 @@
 					</table>
 					<h3>Pixelstore stats</h3>
 					<table>
-						<tr>
-							<td>Cache files</td>
-							<td>Cache size</td>
-							<td>Max cache size</td>
-						</tr>
-						<tr>
-							<td id="cache_files"></td>
-							<td id="cache_size"></td>
-							<td id="cache_max"></td>
-						</tr>
-						<tr>
-							<td>Cache reads</td>
-							<td>Disk reads</td>
-							<td>Remote reads</td>
-						</tr>
-						<tr>
-							<td id="cache_reads"></td>
-							<td id="disk_reads"></td>
-							<td id="remote_reads"></td>
-						</tr>
+						<thead>
+							<tr>
+								<td>Local reads</td>
+								<td>Local read size</td>
+								<td>Remote reads</td>
+								<td>Remote read size</td>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td id="local_reads"></td>
+								<td id="local_read_size"></td>
+								<td id="remote_reads"></td>
+								<td id="remote_read_size"></td>
+							</tr>
+							<tr>
+								<td id="local_reads_rate"></td>
+								<td id="local_read_size_rate"></td>
+								<td id="remote_reads_rate"></td>
+								<td id="remote_read_size_rate"></td>
+							</tr>
+						</tbody>
 					</table>
 					<h3>Websocket statistics</h3>
 					<table>
diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go
index 6e93442..7776649 100644
--- a/webcontroller/web_controller.go
+++ b/webcontroller/web_controller.go
@@ -225,7 +225,6 @@ func (wc *WebController) serveMarkdown(tpl string, requireAuth bool) httprouter.
 			}
 			if inHeader {
 				tpld.Title = string(node.Literal)
-				log.Info(string(node.Literal))
 				return blackfriday.GoToNext
 			}