Skip to content

[release/8.0][browser] fix emscripten out/err overrides #100818

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
lewing merged 3 commits into from
Apr 15, 2024
Merged

[release/8.0][browser] fix emscripten out/err overrides #100818

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16fde2a
backport of https://github.com/dotnet/runtime/pull/100630/
pavelsavara Apr 9, 2024
11e3e0d
fix
pavelsavara Apr 9, 2024
db86836
fix
pavelsavara Apr 9, 2024
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
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@pavelsavara
pavelsavara committed Apr 9, 2024
commit 11e3e0d580efe91c804cdb845f7815cc0b9a525e
2 changes: 1 addition & 1 deletion src/mono/wasm/runtime/loader/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ async function initializeModules(es6Modules: [RuntimeModuleExportsInternal, Nati
const { default: emscriptenFactory } = es6Modules[1];
setRuntimeGlobals(globalObjectsRoot);
initializeExports(globalObjectsRoot);
await configureRuntimeStartup(emscriptenModule);
await configureRuntimeStartup(globalObjectsRoot.module);
loaderHelpers.runtimeModuleLoaded.promise_control.resolve();

emscriptenFactory((originalModule: EmscriptenModuleInternal) => {
Expand Down
3 changes: 3 additions & 0 deletions src/mono/wasm/runtime/startup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ import { BINDING, MONO } from "./net6-legacy/globals";
import { localHeapViewU8 } from "./memory";
import { assertNoProxies } from "./gc-handles";

// default size if MonoConfig.pthreadPoolSize is undefined
const MONO_PTHREAD_POOL_SIZE = 4;

export async function configureRuntimeStartup (module: DotnetModuleInternal): Promise<void> {
if (!module.out) {
// eslint-disable-next-line no-console
Expand Down