Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2025-03-08 11:29:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated WorkerScript-related code for the workerScripts array->map change

Browse Source
This commit is contained in:
danielyxie
2019-06-19 01:51:25 -07:00
committed by danielyxie
parent 821725cf4d
commit 4cc6437408
6 changed files with 83 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/Netscript/killWorkerScript.ts
View File

@ -14,26 +14,31 @@ import { roundToTwo } from "../../utils/helpers/roundToTwo";
export function killWorkerScript(runningScriptObj: RunningScript, serverIp: string): boolean;
export function killWorkerScript(workerScript: WorkerScript): boolean;
export function killWorkerScript(script: RunningScript | WorkerScript, serverIp?: string): boolean {
export function killWorkerScript(pid: number): boolean;
export function killWorkerScript(script: RunningScript | WorkerScript | number, serverIp?: string): boolean {
if (script instanceof WorkerScript) {
script.env.stopFlag = true;
killNetscriptDelay(script);
removeWorkerScript(script);
stopAndCleanUpWorkerScript(script);
return true;
} else if (script instanceof RunningScript && typeof serverIp === "string") {
for (let i = 0; i < workerScripts.length; i++) {
if (workerScripts[i].name == script.filename && workerScripts[i].serverIp == serverIp &&
compareArrays(workerScripts[i].args, script.args)) {
workerScripts[i].env.stopFlag = true;
killNetscriptDelay(workerScripts[i]);
removeWorkerScript(workerScripts[i]);
// Try to kill by PID
const res = killWorkerScriptByPid(script.pid);
if (res) { return res; }
// If for some reason that doesn't work, we'll try the old way
for (const ws of workerScripts.values()) {
if (ws.name == script.filename && ws.serverIp == serverIp &&
compareArrays(ws.args, script.args)) {
stopAndCleanUpWorkerScript(ws);
return true;
}
}
}
return false;
} else if (typeof script === "number") {
return killWorkerScriptByPid(script);
} else {
console.error(`killWorkerScript() called with invalid argument:`);
console.error(script);
@ -41,6 +46,23 @@ export function killWorkerScript(script: RunningScript | WorkerScript, serverIp?
}
}
function stopAndCleanUpWorkerScript(workerScript: WorkerScript): void {
workerScript.env.stopFlag = true;
killNetscriptDelay(workerScript);
removeWorkerScript(workerScript);
}
function killWorkerScriptByPid(pid: number): boolean {
const ws = workerScripts.get(pid);
if (ws instanceof WorkerScript) {
stopAndCleanUpWorkerScript(ws);
return true;
}
return false;
}
/**
* Helper function that removes the script being killed from the global pool.
* Also handles other cleanup-time operations
@ -48,66 +70,47 @@ export function killWorkerScript(script: RunningScript | WorkerScript, serverIp?
* @param {WorkerScript | number} - Identifier for WorkerScript. Either the object itself, or
* its index in the global workerScripts array
*/
function removeWorkerScript(id: WorkerScript | number): void {
// Get a reference to the WorkerScript and its index in the global pool
let workerScript: WorkerScript;
let index: number | null = null;
function removeWorkerScript(workerScript: WorkerScript): void {
if (workerScript instanceof WorkerScript) {
const ip = workerScript.serverIp;
const name = workerScript.name;
if (typeof id === "number") {
if (id < 0 || id >= workerScripts.length) {
console.error(`Too high of an index passed into removeWorkerScript(): ${id}`);
// Get the server on which the script runs
const server = AllServers[ip];
if (server == null) {
console.error(`Could not find server on which this script is running: ${ip}`);
return;
}
workerScript = workerScripts[id];
index = id;
} else if (id instanceof WorkerScript) {
workerScript = id;
for (let i = 0; i < workerScripts.length; ++i) {
if (workerScripts[i] == id) {
index = i;
// Recalculate ram used on that server
server.ramUsed = roundToTwo(server.ramUsed - workerScript.ramUsage);
if (server.ramUsed < 0) {
console.warn(`Server RAM usage went negative (if it's due to floating pt imprecision, it's okay): ${server.ramUsed}`);
server.ramUsed = 0;
}
// Delete the RunningScript object from that server
for (let i = 0; i < server.runningScripts.length; ++i) {
const runningScript = server.runningScripts[i];
if (runningScript.filename === name && compareArrays(runningScript.args, workerScript.args)) {
server.runningScripts.splice(i, 1);
break;
}
}
if (index == null) {
console.error(`Could not find WorkerScript in global pool:`);
console.error(workerScript);
// Delete script from global pool (workerScripts)
const res = workerScripts.delete(workerScript.pid);
if (!res) {
console.warn(`removeWorkerScript() called with WorkerScript that wasn't in the global map:`);
console.warn(workerScript);
}
WorkerScriptStartStopEventEmitter.emitEvent();
} else {
console.error(`Invalid argument passed into removeWorkerScript(): ${id}`);
console.error(`Invalid argument passed into removeWorkerScript():`);
console.error(workerScript);
return;
}
const ip = workerScript.serverIp;
const name = workerScript.name;
// Get the server on which the script runs
const server = AllServers[ip];
if (server == null) {
console.error(`Could not find server on which this script is running: ${ip}`);
return;
}
// Recalculate ram used on that server
server.ramUsed = roundToTwo(server.ramUsed - workerScript.ramUsage);
if (server.ramUsed < 0) {
console.warn(`Server RAM usage went negative (if it's due to floating pt imprecision, it's okay): ${server.ramUsed}`);
server.ramUsed = 0;
}
// Delete the RunningScript object from that server
for (let i = 0; i < server.runningScripts.length; ++i) {
const runningScript = server.runningScripts[i];
if (runningScript.filename === name && compareArrays(runningScript.args, workerScript.args)) {
server.runningScripts.splice(i, 1);
break;
}
}
// Delete script from global pool (workerScripts)
workerScripts.splice(<number>index, 1);
WorkerScriptStartStopEventEmitter.emitEvent();
}
/**

6
src/NetscriptFunctions.js
View File

@ -2178,7 +2178,7 @@ function NetscriptFunctions(workerScript) {
// First element is total income of all currently running scripts
let total = 0;
for (const script of workerScripts) {
for (const script of workerScripts.values()) {
total += (script.scriptRef.onlineMoneyMade / script.scriptRef.onlineRunningTime);
}
res.push(total);
@ -2209,8 +2209,8 @@ function NetscriptFunctions(workerScript) {
updateDynamicRam("getScriptExpGain", getRamCost("getScriptExpGain"));
if (arguments.length === 0) {
var total = 0;
for (var i = 0; i < workerScripts.length; ++i) {
total += (workerScripts[i].scriptRef.onlineExpGained / workerScripts[i].scriptRef.onlineRunningTime);
for (const ws of workerScripts.values()) {
total += (ws.scriptRef.onlineExpGained / ws.scriptRef.onlineRunningTime);
}
return total;
} else {

22
src/NetscriptWorker.js
View File

@ -46,11 +46,12 @@ for (var i = 0; i < CONSTANTS.NumNetscriptPorts; ++i) {
}
export function prestigeWorkerScripts() {
for (var i = 0; i < workerScripts.length; ++i) {
// TODO Signal event emitter
workerScripts[i].env.stopFlag = true;
for (const ws of workerScripts.values()) {
ws.env.stopFlag = true;
}
workerScripts.length = 0;
WorkerScriptStartStopEventEmitter.emitEvent();
workerScripts.clear();
}
// JS script promises need a little massaging to have the same guarantees as netscript
@ -475,7 +476,7 @@ export function addWorkerScript(runningScriptObj, server) {
server.ramUsed = roundToTwo(server.ramUsed + ramUsage);
// Get the pid
const pid = getNextPid();
const pid = generateNextPid();
if (pid === -1) {
throw new Error(
`Failed to start script because could not find available PID. This is most ` +
@ -483,7 +484,8 @@ export function addWorkerScript(runningScriptObj, server) {
);
}
// Create the WorkerScript
// Create the WorkerScript. NOTE: WorkerScript ctor will set the underlying
// RunningScript's PID as well
const s = new WorkerScript(runningScriptObj, pid, NetscriptFunctions);
s.ramUsage = ramUsage;
@ -547,7 +549,7 @@ export function addWorkerScript(runningScriptObj, server) {
});
// Add the WorkerScript to the global pool
workerScripts.push(s);
workerScripts.set(pid, s);
WorkerScriptStartStopEventEmitter.emitEvent();
return;
}
@ -557,9 +559,9 @@ export function addWorkerScript(runningScriptObj, server) {
*/
export function updateOnlineScriptTimes(numCycles = 1) {
var time = (numCycles * Engine._idleSpeed) / 1000; //seconds
for (var i = 0; i < workerScripts.length; ++i) {
workerScripts[i].scriptRef.onlineRunningTime += time;
}
for (const ws of workerScripts.values()) {
ws.scriptRef.onlineRunningTime += time;
}
}
/**

2
src/ui/ActiveScripts/Root.tsx
View File

@ -12,7 +12,7 @@ import { IPlayer } from "../../PersonObjects/IPlayer";
type IProps = {
p: IPlayer;
workerScripts: WorkerScript[];
workerScripts: Map<number, WorkerScript>;
}
export class ActiveScriptsRoot extends React.Component<IProps> {

6
src/ui/ActiveScripts/ScriptProduction.tsx
View File

@ -11,14 +11,14 @@ import { IPlayer } from "../../PersonObjects/IPlayer";
type IProps = {
p: IPlayer;
workerScripts: WorkerScript[];
workerScripts: Map<number, WorkerScript>;
}
export function ScriptProduction(props: IProps): React.ReactElement {
const prodRateSinceLastAug = props.p.scriptProdSinceLastAug / (props.p.playtimeSinceLastAug / 1000);
let onlineProduction = 0;
for (const ws of props.workerScripts) {
for (const ws of props.workerScripts.values()) {
onlineProduction += (ws.scriptRef.onlineMoneyMade / ws.scriptRef.onlineRunningTime);
}
@ -35,7 +35,7 @@ export function ScriptProduction(props: IProps): React.ReactElement {
<span id="active-scripts-total-prod-aug-total" className="money-gold">
{numeralWrapper.formatMoney(props.p.scriptProdSinceLastAug)}
</span>
(<span className="money-gold">
<span id="active-scripts-total-prod-aug-avg" className="money-gold">
{numeralWrapper.formatMoney(prodRateSinceLastAug)}

4
src/ui/ActiveScripts/ServerAccordions.tsx
View File

@ -22,7 +22,7 @@ interface IServerToScriptsMap {
}
type IProps = {
workerScripts: WorkerScript[];
workerScripts: Map<number, WorkerScript>;
};
type IState = {
@ -61,7 +61,7 @@ export class ServerAccordions extends React.Component<IProps, IState> {
updateServerToScriptsMap(): void {
const map: IServerToScriptsMap = {};
for (const ws of this.props.workerScripts) {
for (const ws of this.props.workerScripts.values()) {
const server = getServer(ws.serverIp);
if (server == null) {
console.warn(`WorkerScript has invalid IP address: ${ws.serverIp}`);