Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/beacon-node/src/network/core/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import EventEmitter from "node:events";
import {ResponseIncoming, ResponseOutgoing} from "@lodestar/reqresp";
import {AsyncIterableEventBus, IteratorEvent, RequestEvent} from "../../util/asyncIterableToEvents.js";
import {StrictEventEmitterSingleArg} from "../../util/strictEvents.js";
import {EventDirection} from "../../util/workerEvents.js";
import {EventDirection} from "../events.js";
import {IncomingRequestArgs, OutgoingRequestArgs} from "../reqresp/types.js";

export enum ReqRespBridgeEvent {
Expand Down
8 changes: 7 additions & 1 deletion packages/beacon-node/src/network/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {PeerId, TopicValidatorResult} from "@libp2p/interface";
import {CustodyIndex, Status} from "@lodestar/types";
import {PeerIdStr} from "../util/peerId.js";
import {StrictEventEmitterSingleArg} from "../util/strictEvents.js";
import {EventDirection} from "../util/workerEvents.js";
import {PendingGossipsubMessage} from "./processor/types.js";
import {RequestTypedContainer} from "./reqresp/ReqRespBeaconNode.js";

Expand Down Expand Up @@ -38,6 +37,13 @@ export type NetworkEventData = {
};
};

export enum EventDirection {
workerToMain,
mainToWorker,
/** Event not emitted through worker boundary */
none,
}

export const networkEventDirection: Record<NetworkEvent, EventDirection> = {
[NetworkEvent.peerConnected]: EventDirection.workerToMain,
[NetworkEvent.peerDisconnected]: EventDirection.workerToMain,
Expand Down
17 changes: 9 additions & 8 deletions packages/beacon-node/src/util/workerEvents.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import {MessagePort, Worker} from "node:worker_threads";
import {Message} from "@libp2p/interface";
import {Thread} from "@chainsafe/threads";
import {Logger} from "@lodestar/logger";
import {sleep} from "@lodestar/utils";
import {Metrics} from "../metrics/metrics.js";
import {NetworkCoreWorkerMetrics} from "../network/core/metrics.js";
import {EventDirection, NetworkEvent} from "../network/events.js";
import {StrictEventEmitterSingleArg} from "./strictEvents.js";

const NANO_TO_SECOND_CONVERSION = 1e9;
Expand All @@ -15,13 +17,6 @@ export type WorkerBridgeEvent<EventData> = {
data: EventData[keyof EventData];
};

export enum EventDirection {
workerToMain,
mainToWorker,
/** Event not emitted through worker boundary */
none,
}

/**
* Bridges events from worker to main thread
* Each event can only have one direction:
Expand Down Expand Up @@ -63,7 +58,13 @@ export function wireEventsOnWorkerThread<EventData>(
posted: process.hrtime(),
data,
};
parentPort.postMessage(workerEvent);
let transferList: ArrayBuffer[] | undefined = undefined;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the only change
others were to avoid cyclic dependencies

if (eventName === NetworkEvent.pendingGossipsubMessage) {
const payload = data as {msg: Message};
// Transfer the underlying ArrayBuffer to avoid copy for PendingGossipsubMessage
transferList = [payload.msg.data.buffer as ArrayBuffer];
}
parentPort.postMessage(workerEvent, transferList);
});
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {ZERO_HASH, ZERO_HASH_HEX} from "../../../../src/constants/constants.js";
import {ReqRespBridgeEvent, ReqRespBridgeEventData} from "../../../../src/network/core/events.js";
import {NetworkWorkerApi} from "../../../../src/network/core/index.js";
import {
EventDirection,
GossipType,
NetworkEvent,
NetworkEventData,
Expand All @@ -18,7 +19,6 @@ import {
} from "../../../../src/network/index.js";
import {CommitteeSubscription} from "../../../../src/network/subnets/interface.js";
import {IteratorEventType} from "../../../../src/util/asyncIterableToEvents.js";
import {EventDirection} from "../../../../src/util/workerEvents.js";
import {getValidPeerId, validPeerIdStr} from "../../../utils/peer.js";
import {EchoWorker, getEchoWorker} from "./workerEchoHandler.js";

Expand Down
Loading