From 3b1df888c963d906005ff139892df06a0d1ae2b4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 28 Jan 2019 13:48:35 +0100
Subject: [statistics] Track and display memory/tmp usage of clients

---
 modules-available/statistics/api.inc.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'modules-available/statistics/api.inc.php')

diff --git a/modules-available/statistics/api.inc.php b/modules-available/statistics/api.inc.php
index 813e7d54..57c4cee2 100644
--- a/modules-available/statistics/api.inc.php
+++ b/modules-available/statistics/api.inc.php
@@ -34,7 +34,8 @@ if ($type{0} === '~') {
 	// External mode of operation?
 	$mode = Request::post('mode', false, 'string');
 	$NOW = time();
-	$old = Database::queryFirst('SELECT clientip, logintime, lastseen, lastboot, state, mbram, cpumodel FROM machine WHERE machineuuid = :uuid', array('uuid' => $uuid));
+	$old = Database::queryFirst('SELECT clientip, logintime, lastseen, lastboot, state, mbram, cpumodel, live_memfree, live_swapfree, live_tmpfree
+			FROM machine WHERE machineuuid = :uuid', array('uuid' => $uuid));
 	if ($old !== false) {
 		settype($old['logintime'], 'integer');
 		settype($old['lastseen'], 'integer');
@@ -114,6 +115,7 @@ if ($type{0} === '~') {
 				. ' cpumodel = :cpumodel,'
 				. ' systemmodel = :systemmodel,'
 				. ' id44mb = :id44mb,'
+				. ' live_tmpsize = 0, live_swapsize = 0, live_memsize = 0,'
 				. ' badsectors = :badsectors,'
 				. ' data = :data,'
 				. ' state = :state    '
@@ -152,7 +154,10 @@ if ($type{0} === '~') {
 
 			// Log potential crash
 			if ($old['state'] === 'IDLE' || $old['state'] === 'OCCUPIED') {
-				writeClientLog('machine-mismatch-poweron', 'Client sent poweron event, but previous known state is ' . $old['state']);
+				writeClientLog('machine-mismatch-poweron', 'Poweron event, but previous known state is ' . $old['state']
+					. '. RAM: ' . Util::readableFileSize($old['live_memfree'], -1, 2)
+					. ', Swap: ' . Util::readableFileSize($old['live_swapfree'], -1, 2)
+					. ', ID44: ' . Util::readableFileSize($old['live_memfree'], -1, 2));
 			}
 		}
 
@@ -190,6 +195,10 @@ if ($type{0} === '~') {
 				}
 			}
 		}
+		foreach (['memsize', 'tmpsize', 'swapsize', 'memfree', 'tmpfree', 'swapfree'] as $item) {
+			$strUpdateBoottime .= ' live_' . $item . ' = :_' . $item . ', ';
+			$params['_' . $item] = ceil(Request::post($item, 0, 'int') / 1024);
+		}
 		// Figure out what's happening - state changes
 		if ($used === 0 && $old['state'] !== 'IDLE') {
 			if ($old['state'] === 'OCCUPIED' && $sessionLength === 0) {
-- 
cgit v1.2.3-55-g7522