Skip to content

[wasm] rewrite crypto-worker to typescript #73073

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

Merged
pavelsavara merged 2 commits into from
Aug 6, 2022
+410 −406
Merged

[wasm] rewrite crypto-worker to typescript #73073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1013b63
move changes to other PRs and rebase on main
pavelsavara Aug 5, 2022
29c3e50
returning some noisy console logs in hope that they are serializing a…
pavelsavara Aug 5, 2022
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
34 changes: 22 additions & 12 deletions src/mono/wasm/runtime/crypto-worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

import { Module } from "./imports";
import { Module, runtimeHelpers } from "./imports";
import { mono_assert } from "./types";

class OperationFailedError extends Error { }
Expand Down Expand Up @@ -112,11 +112,13 @@ export function init_crypto(): void {
channel: chan,
worker: worker,
};
worker.postMessage({
const messageData: InitCryptoMessageData = {
config: JSON.stringify(runtimeHelpers.config),
comm_buf: chan.get_comm_buffer(),
msg_buf: chan.get_msg_buffer(),
msg_char_len: chan.get_msg_len()
});
};
worker.postMessage(messageData);
worker.onerror = event => {
console.warn(`MONO_WASM: Error in Crypto WebWorker. Cryptography digest calls will fallback to managed implementation. Error: ${event.message}`);
mono_wasm_crypto = null;
Expand Down Expand Up @@ -202,9 +204,10 @@ class LibraryChannel {

public send_msg(msg: string): string {
try {
// const state = Atomics.load(this.comm, this.STATE_IDX);
// if (state !== this.STATE_IDLE) console.debug(`MONO_WASM_ENCRYPT_DECRYPT: send_msg, waiting for idle now, ${state}`);
this.wait_for_state(pstate => pstate == this.STATE_IDLE, "waiting");
let state = Atomics.load(this.comm, this.STATE_IDX);
// FIXME: this console write is possibly serializing the access and prevents a deadlock
if (state !== this.STATE_IDLE) console.debug(`MONO_WASM_ENCRYPT_DECRYPT: send_msg, waiting for idle now, ${state}`);
state = this.wait_for_state(pstate => pstate == this.STATE_IDLE, "waiting");

this.send_request(msg);
return this.read_response();
Expand All @@ -213,13 +216,14 @@ class LibraryChannel {
throw err;
}
finally {
// const state = Atomics.load(this.comm, this.STATE_IDX);
// if (state !== this.STATE_IDLE) console.debug(`MONO_WASM_ENCRYPT_DECRYPT: state at end of send_msg: ${state}`);
const state = Atomics.load(this.comm, this.STATE_IDX);
// FIXME: this console write is possibly serializing the access and prevents a deadlock
if (state !== this.STATE_IDLE) console.debug(`MONO_WASM_ENCRYPT_DECRYPT: state at end of send_msg: ${state}`);
}
}

public shutdown(): void {
// console.debug("MONO_WASM_ENCRYPT_DECRYPT: Shutting down crypto");
console.debug("MONO_WASM_ENCRYPT_DECRYPT: Shutting down crypto");
const state = Atomics.load(this.comm, this.STATE_IDX);
if (state !== this.STATE_IDLE)
throw new Error(`OWNER: Invalid sync communication channel state: ${state}`);
Expand All @@ -230,15 +234,14 @@ class LibraryChannel {
Atomics.notify(this.comm, this.STATE_IDX);
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
private reset(reason: string): void {
// console.debug(`MONO_WASM_ENCRYPT_DECRYPT: reset: ${reason}`);
console.debug(`MONO_WASM_ENCRYPT_DECRYPT: reset: ${reason}`);
const state = Atomics.load(this.comm, this.STATE_IDX);
if (state === this.STATE_SHUTDOWN)
return;

if (state === this.STATE_RESET || state === this.STATE_IDLE) {
// console.debug(`MONO_WASM_ENCRYPT_DECRYPT: state is already RESET or idle: ${state}`);
console.debug(`MONO_WASM_ENCRYPT_DECRYPT: state is already RESET or idle: ${state}`);
return;
}

Expand Down Expand Up @@ -386,3 +389,10 @@ class LibraryChannel {
return new LibraryChannel(msg_char_len);
}
}

export type InitCryptoMessageData = {
config: string,// serialized to avoid passing non-clonable objects
comm_buf: SharedArrayBuffer,
msg_buf: SharedArrayBuffer,
msg_char_len: number
}
Loading