Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(swingset): record xs-workers to $XSNAP_TEST_RECORD if set #3392

Merged
merged 2 commits into from
Jun 22, 2021
Merged

feat(swingset): record xs-workers to $XSNAP_TEST_RECORD if set #3392

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
495ddf8
feat(swingset): record xs-workers to $XSNAP_TEST_RECORD if set
dckc Jun 22, 2021
7d4f8e4
Merge branch 'master' into 3383-xs-worker-record
dckc Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions packages/SwingSet/src/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { assert, details as X } from '@agoric/assert';
import { isTamed, tameMetering } from '@agoric/tame-metering';
import { importBundle } from '@agoric/import-bundle';
import { makeMeteringTransformer } from '@agoric/transform-metering';
import { xsnap, makeSnapstore } from '@agoric/xsnap';
import { xsnap, makeSnapstore, recordXSnap } from '@agoric/xsnap';

import engineGC from './engine-gc.js';
import { WeakRef, FinalizationRegistry } from './weakref.js';
Expand Down Expand Up @@ -64,6 +64,21 @@ export function makeStartXSnap(bundles, { snapstorePath, env, spawn }) {
debug: !!env.XSNAP_DEBUG,
};

let doXSnap = xsnap;
const { XSNAP_TEST_RECORD } = env;
if (XSNAP_TEST_RECORD) {
console.log('SwingSet xs-worker tracing:', { XSNAP_TEST_RECORD });
let serial = 0;
doXSnap = opts => {
const workerTrace = `${XSNAP_TEST_RECORD}/${serial}/`;
serial += 1;
fs.mkdirSync(workerTrace, { recursive: true });
return recordXSnap(opts, workerTrace, {
writeFileSync: fs.writeFileSync,
});
};
}

/** @type { ReturnType<typeof makeSnapstore> } */
let snapStore;

Expand All @@ -90,13 +105,13 @@ export function makeStartXSnap(bundles, { snapstorePath, env, spawn }) {
async function startXSnap(name, handleCommand, metered) {
if (supervisorHash) {
return snapStore.load(supervisorHash, async snapshot => {
const xs = xsnap({ snapshot, name, handleCommand, ...xsnapOpts });
const xs = doXSnap({ snapshot, name, handleCommand, ...xsnapOpts });
await xs.evaluate('null'); // ensure that spawn is done
return xs;
});
}
const meterOpts = metered ? {} : { meteringLimit: 0 };
const worker = xsnap({ handleCommand, name, ...meterOpts, ...xsnapOpts });
const worker = doXSnap({ handleCommand, name, ...meterOpts, ...xsnapOpts });

for (const bundle of bundles) {
assert(
Expand Down