Update "top" command- columns and loops

Switched the RAM and thread columns so that the RAM usage does not need to be rounded. Updated structure to remove nested loops.
This commit is contained in:
Kyle B 2017-06-16 14:17:40 -04:00 committed by GitHub
parent 96be33344f
commit 92b100f3ce

@ -958,32 +958,30 @@ var Terminal = {
post("Incorrect usage of top command. Usage: top"); return; post("Incorrect usage of top command. Usage: top"); return;
} }
post("Script RAM Usage Threads"); post("Script Threads RAM Usage");
var currRunningScripts = Player.getCurrentServer().runningScripts; var currRunningScripts = Player.getCurrentServer().runningScripts;
//Iterate through active scripts on current server var currScripts = Player.getCurrentServer().scripts;
for(var i = 0; i < currRunningScripts.length; i++) {
//Iterate through scripts on current server //Iterate through scripts on current server
for(var j = 0; j < Player.getCurrentServer().scripts.length; j++) { for(var i = 0; i < currScripts.length; i++) {
if(currRunningScripts[i] === Player.getCurrentServer().scripts[j].filename) { //If the script is active if(currRunningScripts.includes(currScripts[i].filename)) { //If the script is running
var script = Player.getCurrentServer().scripts[j]; var script = currScripts[i];
//Calculate name padding //Calculate name padding
var numSpacesScript = 26 - script.filename.length; // 26 is the width of each column var numSpacesScript = 26 - script.filename.length; //26 -> width of name column
var spacesScript = Array(numSpacesScript+1).join(" "); var spacesScript = Array(numSpacesScript+1).join(" ");
//Calculate thread padding
var numSpacesThread = 16 - (script.threads + "").length; //16 -> width of thread column
var spacesThread = Array(numSpacesThread+1).join(" ");
//Calculate and transform RAM usage //Calculate and transform RAM usage
var ramUsage = script.ramUsage * script.threads * Math.pow(1.02, script.threads - 1); var ramUsage = script.ramUsage * script.threads * Math.pow(1.02, script.threads - 1);
ramUsage = ramUsage.toFixed(3) + "GB"; //Rounds RAM to three decimal places ramUsage = ramUsage + "GB";
//Calculate RAM padding var entry = [script.filename, spacesScript, script.threads, spacesThread, ramUsage];
var numSpacesRAM = 26 - ramUsage.length;
var spacesRAM = Array(numSpacesRAM+1).join(" ");
var entry = [script.filename, spacesScript, ramUsage, spacesRAM, script.threads];
post(entry.join("")); post(entry.join(""));
} }
}
} }
break; break;
default: default: