Sync with Mizzajl
This commit is contained in:
@@ -335,8 +335,8 @@ export function sortJsonArrayByKey(array, primaryKey, secondaryKey) {
|
||||
|
||||
|
||||
/** @param {NS} ns */
|
||||
export async function distributeScript(ns, sScript, nThreads, ...args) {
|
||||
ns.tail();
|
||||
export async function distributeScript(ns, sScript, nThreads, [...args]) {
|
||||
//ns.tail();
|
||||
ns.disableLog("ALL");
|
||||
|
||||
const sListName = "serverList.txt";
|
||||
@@ -357,15 +357,17 @@ export async function distributeScript(ns, sScript, nThreads, ...args) {
|
||||
aSortedList.forEach((entry) => {
|
||||
let sHost = entry.serverName;
|
||||
ns.print("sHost = " + sHost)
|
||||
ns.scp(sScript, sHost);
|
||||
|
||||
let nFreeRAM = ns.getServerMaxRam(entry.serverName) - ns.getServerUsedRam(entry.serverName);
|
||||
if (nThreads >= 1 && entry.rootAccess && nFreeRAM >= nTotalSize) {
|
||||
ns.scp(sScript, sHost);
|
||||
ns.exec(sScript, sHost, nThreads, ...args);
|
||||
nThreads = 0;
|
||||
nFreeRAM = ns.getServerMaxRam(entry.serverName) - ns.getServerUsedRam(entry.serverName);
|
||||
}
|
||||
else if (nThreads >= 1 && entry.rootAccess && nFreeRAM >= nScriptSize) {
|
||||
let nThreadsDist = Math.floor(nFreeRAM / nScriptSize);
|
||||
ns.scp(sScript, sHost);
|
||||
ns.print("room for : " + nThreadsDist + " scripts");
|
||||
ns.exec(sScript, sHost, nThreadsDist, ...args);
|
||||
nThreads -= nThreadsDist;
|
||||
|
||||
Reference in New Issue
Block a user