From 78b428df4984d855a6eb2e0007d5dd2a17839abf Mon Sep 17 00:00:00 2001
From: Dan Connolly <connolly@agoric.com>
Date: Fri, 19 Mar 2021 01:40:18 -0500
Subject: [PATCH] feat(swingset): provide name to xsnap via managerOptions

---
 packages/SwingSet/src/kernel/loadVat.js                        | 1 +
 packages/SwingSet/src/kernel/vatManager/factory.js             | 1 +
 .../SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js | 3 ++-
 packages/SwingSet/src/types.js                                 | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SwingSet/src/kernel/loadVat.js b/packages/SwingSet/src/kernel/loadVat.js
index a3a7d2a07ac..fe1f4646244 100644
--- a/packages/SwingSet/src/kernel/loadVat.js
+++ b/packages/SwingSet/src/kernel/loadVat.js
@@ -216,6 +216,7 @@ export function makeVatLoader(stuff) {
         liveSlotsConsole: makeVatConsole('ls', vatID),
         vatParameters,
         virtualObjectCacheSize,
+        name,
       };
       // TODO: We need to support within-vat metering (for the Spawner) until
       // #1343 is fixed, after which we can remove
diff --git a/packages/SwingSet/src/kernel/vatManager/factory.js b/packages/SwingSet/src/kernel/vatManager/factory.js
index cef60f5fdd1..eeaa8e0d649 100644
--- a/packages/SwingSet/src/kernel/vatManager/factory.js
+++ b/packages/SwingSet/src/kernel/vatManager/factory.js
@@ -65,6 +65,7 @@ export function makeVatManagerFactory({
       'virtualObjectCacheSize',
       'vatParameters',
       'vatConsole',
+      'name',
     ]);
     const { setup, bundle, enableSetup = false } = managerOptions;
     assert(setup || bundle);
diff --git a/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js
index 528721c85d6..104350dbb0d 100644
--- a/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js
+++ b/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js
@@ -48,6 +48,7 @@ export function makeXsSubprocessFactory({
       vatParameters,
       virtualObjectCacheSize,
       enableDisavow,
+      name,
     } = managerOptions;
     assert(!managerOptions.metered, 'xs-worker: metered not supported yet');
     assert(
@@ -127,7 +128,7 @@ export function makeXsSubprocessFactory({
     }
 
     // start the worker and establish a connection
-    const { worker, bundles } = startXSnap(`${vatID}`, handleCommand);
+    const { worker, bundles } = startXSnap(`${vatID}:${name}`, handleCommand);
     for await (const [it, superCode] of Object.entries(bundles)) {
       parentLog(vatID, 'eval bundle', it);
       assert(
diff --git a/packages/SwingSet/src/types.js b/packages/SwingSet/src/types.js
index 639b56c195b..3492bbefd9d 100644
--- a/packages/SwingSet/src/types.js
+++ b/packages/SwingSet/src/types.js
@@ -24,6 +24,7 @@
  *   enableDisavow?: boolean,
  *   vatParameters: Record<string, unknown>,
  *   virtualObjectCacheSize: number,
+ *   name?: string,
  * } & (HasBundle | HasSetup)} ManagerOptions
  */