Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-18 13:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix zombie scripts (#203)

Browse Source 
Also made installAugmentations synchronously perform reset, but added a short timeout to the callback script launch for balance.
This commit is contained in:
Snarling 2022-11-08 12:17:34 -05:00 committed by GitHub
parent 01b131526a
commit 6f08aee8f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Netscript/killWorkerScript.ts
View File

@ -107,14 +107,8 @@ function removeWorkerScript(workerScript: WorkerScript): void {
server.updateRamUsed(0);
for (const rs of server.runningScripts) server.updateRamUsed(server.ramUsed + rs.ramUsage * rs.threads);
// Delete script from global pool (workerScripts)
workerScripts.delete(workerScript.pid);
// const res = workerScripts.delete(workerScript.pid);
// if (!res) {
// console.warn(`removeWorkerScript() called with WorkerScript that wasn't in the global map:`);
// console.warn(workerScript);
// }
// Delete script from global pool (workerScripts) after verifying it's the right script (PIDs reset on aug install)
if (workerScripts.get(workerScript.pid) === workerScript) workerScripts.delete(workerScript.pid);
AddRecentScript(workerScript);
WorkerScriptStartStopEventEmitter.emit();
}

18
src/NetscriptFunctions/Singularity.ts
View File

@ -5,7 +5,6 @@ import { Augmentation } from "../Augmentation/Augmentation";
import { StaticAugmentations } from "../Augmentation/StaticAugmentations";
import { augmentationExists, installAugmentations } from "../Augmentation/AugmentationHelpers";
import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
import { killWorkerScript } from "../Netscript/killWorkerScript";
import { CONSTANTS } from "../Constants";
import { isString } from "../utils/helpers/isString";
import { RunningScript } from "../Script/RunningScript";
@ -213,12 +212,8 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
const cbScript = _cbScript ? helpers.string(ctx, "cbScript", _cbScript) : "";
helpers.log(ctx, () => "Soft resetting. This will cause this script to be killed");
setTimeout(() => {
installAugmentations(true);
runAfterReset(cbScript);
}, 0);
killWorkerScript(ctx.workerScript);
installAugmentations(true);
if (cbScript) setTimeout(() => runAfterReset(cbScript), 500);
},
installAugmentations: (ctx) => (_cbScript) => {
helpers.checkSingularityAccess(ctx);
@ -230,13 +225,8 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
}
Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
helpers.log(ctx, () => "Installing Augmentations. This will cause this script to be killed");
setTimeout(() => {
installAugmentations();
runAfterReset(cbScript);
}, 0);
killWorkerScript(ctx.workerScript);
return true;
installAugmentations();
if (cbScript) setTimeout(() => runAfterReset(cbScript), 500);
},
goToLocation: (ctx) => (_locationName) => {