-
Notifications
You must be signed in to change notification settings - Fork 212
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
report bundle sizing in agoric run (#9503)
refs: #1656 ## Description Spike on endojs/endo#1656 @kriskowal , similar to #8416 @dckc Makes the core-eval metadata available to `agoric run` so it can report more to the user. cc @michaelfig Adds a `--verbose` flag to report: <img width="687" alt="Screenshot 2024-06-13 at 1 46 28 PM" src="https://github.com/Agoric/agoric-sdk/assets/21505/b76b4d14-2fbd-45c2-b7a5-d94f964f2461"> Also a `scripts/stat-bundle.js` to stat a known bundle path. ### Security Considerations ### Scaling Considerations ### Documentation Considerations ### Testing Considerations ### Upgrade Considerations
- Loading branch information
Showing
6 changed files
with
177 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#!/usr/bin/env node | ||
import assert from 'node:assert'; | ||
import process from 'node:process'; | ||
import { statBundle } from '../src/lib/bundles.js'; | ||
|
||
const filename = process.argv[2]; | ||
assert(filename, 'usage: stat-bundle.js <filename>'); | ||
|
||
await statBundle(filename); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
#!/usr/bin/env node | ||
import process from 'node:process'; | ||
import { statPlans } from '../src/lib/bundles.js'; | ||
|
||
await statPlans(process.cwd()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
// @ts-check | ||
|
||
/* global Buffer */ | ||
|
||
import assert from 'node:assert/strict'; | ||
import fs from 'node:fs'; | ||
import { join } from 'node:path'; | ||
|
||
import { ZipReader } from '@endo/zip'; | ||
|
||
/** @import {Bundle} from '@agoric/swingset-vat'; */ | ||
/** @import {CoreEvalPlan} from '@agoric/deploy-script-support/src/writeCoreEvalParts.js' */ | ||
|
||
const PACKAGE_NAME_RE = /(?<packageName>.*-v[\d.]+)\//; | ||
|
||
/** | ||
* @typedef {{ name: string, label: string, location: string, modules: Record<string, {compartment: string, module: string}>}} Compartment | ||
*/ | ||
|
||
/** | ||
* @typedef CompartmentMap | ||
* @property {string[]} tags | ||
* @property {{compartment: string, module: string}} entry | ||
* @property {Record<string, Compartment>} compartments | ||
*/ | ||
|
||
/** @param {Bundle} bundleObj*/ | ||
export const extractBundleInfo = async bundleObj => { | ||
if (bundleObj.moduleFormat !== 'endoZipBase64') { | ||
throw new Error('only endoZipBase64 is supported'); | ||
} | ||
|
||
const contents = Buffer.from(bundleObj.endoZipBase64, 'base64'); | ||
|
||
const zipReader = new ZipReader(contents); | ||
const { files } = zipReader; | ||
|
||
const cmapEntry = files.get('compartment-map.json'); | ||
/** @type {CompartmentMap} */ | ||
const compartmentMap = JSON.parse(Buffer.from(cmapEntry.content).toString()); | ||
|
||
// XXX mapIter better but requires SES | ||
const fileSizes = Object.fromEntries( | ||
Array.from(files.values()).map(f => [ | ||
f.name, | ||
// bundle contents are not compressed | ||
f.content.length, | ||
]), | ||
); | ||
|
||
return { compartmentMap, fileSizes }; | ||
}; | ||
|
||
// UNTIL https://github.com/endojs/endo/issues/1656 | ||
/** @param {string} bundleFilename */ | ||
export const statBundle = async bundleFilename => { | ||
const bundle = fs.readFileSync(bundleFilename, 'utf8'); | ||
/** @type {Bundle} */ | ||
const bundleObj = JSON.parse(bundle); | ||
console.log('\nBUNDLE', bundleObj.moduleFormat, bundleFilename); | ||
|
||
const info = await extractBundleInfo(bundleObj); | ||
assert(info, 'no bundle info'); | ||
|
||
/** @type {Record<string, number>} */ | ||
const byPackage = {}; | ||
let totalSize = 0; | ||
for (const [filename, size] of Object.entries(info.fileSizes)) { | ||
totalSize += size; | ||
if (filename === 'compartment-map.json') { | ||
continue; | ||
} | ||
const { packageName } = filename.match(PACKAGE_NAME_RE)?.groups ?? {}; | ||
assert(packageName, `invalid filename ${filename}`); | ||
byPackage[packageName] ||= 0; | ||
byPackage[packageName] += size; | ||
} | ||
|
||
console.log('Sum of file sizes in each package:'); | ||
console.table(byPackage); | ||
|
||
console.log('total size:', totalSize); | ||
console.log('\nTo explore the contents:\n'); | ||
console.log( | ||
` DIR=$(mktemp -d); cat ${bundleFilename} | jq -r .endoZipBase64 | base64 -d | tar xC $DIR; open $DIR`, | ||
); | ||
}; | ||
|
||
/** @param {string} path */ | ||
export const statPlans = async path => { | ||
const files = await fs.promises.readdir(path); | ||
const planfiles = files.filter(f => f.endsWith('plan.json')); | ||
|
||
for (const planfile of planfiles) { | ||
/** @type {CoreEvalPlan} */ | ||
const plan = JSON.parse(fs.readFileSync(join(path, planfile), 'utf8')); | ||
console.log('\n**\nPLAN', plan.name); | ||
for (const bundle of plan.bundles) { | ||
await statBundle(bundle.fileName); | ||
} | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters