wip

Author: pavelsavara

src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj

@@ -108,18 +108,16 @@
 
     <FeatureMono>true</FeatureMono>
     <FeatureWasmManagedThreads Condition="('$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true') and '$(WasmEnableThreads)' == 'true'">true</FeatureWasmManagedThreads>
-    <FeatureWasmPerfTracing Condition="('$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true') and ('$(WasmEnableThreads)' == 'true')">true</FeatureWasmPerfTracing>
     <FeaturePortableTimer Condition="('$(TargetsBrowser)' != 'true' and '$(TargetsWasi)' != 'true') or '$(FeatureWasmManagedThreads)' == 'true'">true</FeaturePortableTimer>
     <FeaturePortableThreadPool Condition="('$(TargetsBrowser)' != 'true' and '$(TargetsWasi)' != 'true') or '$(FeatureWasmManagedThreads)' == 'true'">true</FeaturePortableThreadPool>
-    <FeaturePerfTracing Condition="('$(TargetsBrowser)' != 'true' and '$(TargetsWasi)' != 'true') or '$(FeatureWasmPerftracing)' == 'true'">true</FeaturePerfTracing>
+    <FeaturePerfTracing Condition="('$(TargetsWasi)' != 'true')">true</FeaturePerfTracing>
     <FeatureObjCMarshal Condition="'$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">true</FeatureObjCMarshal>
   </PropertyGroup>
 
   <PropertyGroup>
     <DefineConstants Condition="'$(FeaturePerfTracing)' == 'true'">$(DefineConstants);FEATURE_PERFTRACING</DefineConstants>
     <DefineConstants Condition="'$(FeatureObjCMarshal)' == 'true'">$(DefineConstants);FEATURE_OBJCMARSHAL</DefineConstants>
     <DefineConstants Condition="'$(FeatureWasmManagedThreads)' == 'true'">$(DefineConstants);FEATURE_WASM_MANAGED_THREADS</DefineConstants>
-    <DefineConstants Condition="'$(FeatureWasmPerfTracing)' == 'true'">$(DefineConstants);FEATURE_WASM_PERFTRACING</DefineConstants>
   </PropertyGroup>
 
   <!-- ILLinker settings -->
@@ -132,7 +130,7 @@
     <ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.xml" />
     <ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.OSX.xml" Condition="'$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" />
     <ILLinkDescriptorsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.Shared.xml" />
-    <ILLinkDescriptorsXmls Condition="'$(FeaturePerfTracing)' == 'true'" Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.EventSource.xml" />
+    <ILLinkDescriptorsLibraryBuildXml Condition="'$(FeaturePerfTracing)' == 'true'" Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.EventSource.xml" />
 
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.$(Platform).xml" Condition="Exists('$(ILLinkDirectory)ILLink.Substitutions.$(Platform).xml')" />
     <ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.iOS.xml" Condition="'$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" />

src/mono/browser/runtime/corebindings.c

@@ -32,6 +32,7 @@ extern void mono_wasm_invoke_js_function (int function_js_handle, void *args);
 extern int mono_runtime_run_module_cctor (MonoImage *image, MonoError *error);
 
 typedef void (*background_job_cb)(void);
+typedef int (*background_job_cb1)(void* data);
 
 void mono_wasm_bind_assembly_exports (char *assembly_name);
 void mono_wasm_assembly_get_entry_point (char *assembly_name, int auto_insert_breakpoint, MonoMethod **method_out);

src/mono/browser/runtime/cwraps.ts

@@ -17,13 +17,6 @@ type SigLine = [lazyOrSkip: boolean | (() => boolean), name: string, returnType:
 
 const threading_cwraps: SigLine[] = WasmEnableThreads ? [
     // MONO.diagnostics
-    [true, "mono_wasm_event_pipe_enable", "bool", ["string", "number", "number", "string", "bool", "number"]],
-    [true, "mono_wasm_event_pipe_session_start_streaming", "bool", ["number"]],
-    [true, "mono_wasm_event_pipe_session_disable", "bool", ["number"]],
-    [true, "mono_wasm_diagnostic_server_create_thread", "bool", ["string", "number"]],
-    [true, "mono_wasm_diagnostic_server_thread_attach_to_runtime", "void", []],
-    [true, "mono_wasm_diagnostic_server_post_resume_runtime", "void", []],
-    [true, "mono_wasm_diagnostic_server_create_stream", "number", []],
     [false, "mono_wasm_init_finalizer_thread", null, []],
     [false, "mono_wasm_invoke_jsexport_async_post", "void", ["number", "number", "number"]],
     [false, "mono_wasm_invoke_jsexport_sync_send", "void", ["number", "number", "number"]],
@@ -49,6 +42,7 @@ const fn_signatures: SigLine[] = [
     [true, "mono_wasm_parse_runtime_options", null, ["number", "number"]],
     [true, "mono_wasm_strdup", "number", ["string"]],
     [true, "mono_background_exec", null, []],
+    [true, "mono_ep_exec", null, []],
     [true, "mono_wasm_execute_timer", null, []],
     [true, "mono_wasm_load_icu_data", "number", ["number"]],
     [false, "mono_wasm_add_assembly", "number", ["string", "number", "number"]],
@@ -143,13 +137,6 @@ const fn_signatures: SigLine[] = [
 
 export interface t_ThreadingCwraps {
     // MONO.diagnostics
-    mono_wasm_event_pipe_enable(outputPath: string | null, stream: VoidPtr, bufferSizeInMB: number, providers: string, rundownRequested: boolean, outSessionId: VoidPtr): boolean;
-    mono_wasm_event_pipe_session_start_streaming(sessionId: number): boolean;
-    mono_wasm_event_pipe_session_disable(sessionId: number): boolean;
-    mono_wasm_diagnostic_server_create_thread(websocketURL: string, threadIdOutPtr: VoidPtr): boolean;
-    mono_wasm_diagnostic_server_thread_attach_to_runtime(): void;
-    mono_wasm_diagnostic_server_post_resume_runtime(): void;
-    mono_wasm_diagnostic_server_create_stream(): VoidPtr;
     mono_wasm_init_finalizer_thread(): void;
     mono_wasm_invoke_jsexport_async_post(targetTID: PThreadPtr, method: MonoMethod, args: VoidPtr): void;
     mono_wasm_invoke_jsexport_sync_send(targetTID: PThreadPtr, method: MonoMethod, args: VoidPtr): void;
@@ -180,6 +167,7 @@ export interface t_Cwraps {
     mono_wasm_strdup(value: string): number;
     mono_wasm_parse_runtime_options(length: number, argv: VoidPtr): void;
     mono_background_exec(): void;
+    mono_ep_exec(): void;
     mono_wasm_execute_timer(): void;
     mono_wasm_load_icu_data(offset: VoidPtr): number;
     mono_wasm_add_assembly(name: string, data: VoidPtr, size: number): number;

src/mono/browser/runtime/diag/index.ts

@@ -0,0 +1,78 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+import WasmEnablePerfTracing from "consts:wasmEnablePerfTracing";
+
+import { Module } from "../globals";
+import { utf8ToString } from "../strings";
+import { CharPtr, VoidPtr } from "../types/emscripten";
+import { createDiagConnectionJs } from "./diag-js";
+import { IDiagConnection } from "./common";
+import { createDiagConnectionWs } from "./diag-ws";
+
+let socket_handles:Map<number, IDiagConnection> = undefined as any;
+let next_socket_handle = 1;
+
+export function mono_wasm_ipc_websocket_create (urlPtr :CharPtr):number {
+    if (!WasmEnablePerfTracing) {
+        return -1;
+    }
+    if (!socket_handles) {
+        socket_handles = new Map<number, IDiagConnection>();
+    }
+    const url = utf8ToString(urlPtr);
+    const socket_handle = next_socket_handle++;
+    const isWebSocket = url.startsWith("ws://") || url.startsWith("wss://");
+    const wrapper = isWebSocket
+        ? createDiagConnectionWs(socket_handle, url)
+        : createDiagConnectionJs(socket_handle, url);
+    socket_handles.set(socket_handle, wrapper);
+    return socket_handle;
+}
+
+export function mono_wasm_ipc_websocket_send (client_socket :number, buffer:VoidPtr, bytes_to_write:number):number {
+    if (!WasmEnablePerfTracing) {
+        return -1;
+    }
+    const wrapper = socket_handles.get(client_socket);
+    if (!wrapper) {
+        return -1;
+    }
+    const message = (new Uint8Array(Module.HEAPU8.buffer, buffer as any, bytes_to_write)).slice();
+    return wrapper.send(message);
+}
+
+export function mono_wasm_ipc_websocket_poll (client_socket :number):number {
+    if (!WasmEnablePerfTracing) {
+        return -1;
+    }
+    const wrapper = socket_handles.get(client_socket);
+    if (!wrapper) {
+        return 0;
+    }
+    return wrapper.poll();
+}
+
+export function mono_wasm_ipc_websocket_recv (client_socket :number, buffer:VoidPtr, bytes_to_read:number):number {
+    if (!WasmEnablePerfTracing) {
+        return -1;
+    }
+    const wrapper = socket_handles.get(client_socket);
+    if (!wrapper) {
+        return -1;
+    }
+    return wrapper.recv(buffer, bytes_to_read);
+}
+
+export function mono_wasm_ipc_websocket_close (client_socket :number):number {
+    if (!WasmEnablePerfTracing) {
+        return -1;
+    }
+    const wrapper = socket_handles.get(client_socket);
+    if (!wrapper) {
+        return -1;
+    }
+    socket_handles.delete(client_socket);
+    return wrapper.close();
+}
+

src/mono/browser/runtime/exports-binding.ts

@@ -12,9 +12,6 @@ import { mono_interp_jit_wasm_jit_call_trampoline, mono_interp_invoke_wasm_jit_c
 import { mono_wasm_resolve_or_reject_promise } from "./marshal-to-js";
 import { mono_wasm_schedule_timer, schedule_background_exec } from "./scheduling";
 import { mono_wasm_asm_loaded } from "./startup";
-import { mono_wasm_diagnostic_server_on_server_thread_created } from "./diagnostics/server_pthread";
-import { mono_wasm_diagnostic_server_on_runtime_server_init, mono_wasm_event_pipe_early_startup_callback } from "./diagnostics";
-import { mono_wasm_diagnostic_server_stream_signal_work_available } from "./diagnostics/server_pthread/stream-queue";
 import { mono_log_warn, mono_wasm_console_clear, mono_wasm_trace_logger } from "./logging";
 import { mono_wasm_profiler_leave, mono_wasm_profiler_enter } from "./profiler";
 import { mono_wasm_browser_entropy } from "./crypto";
@@ -28,6 +25,7 @@ import {
 import { mono_wasm_dump_threads } from "./pthreads/ui-thread";
 import { mono_wasm_schedule_synchronization_context } from "./pthreads/shared";
 import { mono_wasm_js_globalization_imports } from "./globalization";
+import { mono_wasm_ipc_websocket_create, mono_wasm_ipc_websocket_send, mono_wasm_ipc_websocket_poll, mono_wasm_ipc_websocket_recv, mono_wasm_ipc_websocket_close } from "./diag";
 
 // the JS methods would be visible to EMCC linker and become imports of the WASM module
 
@@ -43,10 +41,6 @@ export const mono_wasm_threads_imports = !WasmEnableThreads ? [] : [
 
     // mono-threads.c
     mono_wasm_dump_threads,
-    // diagnostics_server.c
-    mono_wasm_diagnostic_server_on_server_thread_created,
-    mono_wasm_diagnostic_server_on_runtime_server_init,
-    mono_wasm_diagnostic_server_stream_signal_work_available,
 
     // corebindings.c
     mono_wasm_install_js_worker_interop,
@@ -68,6 +62,13 @@ export const mono_wasm_imports = [
     // mono-threads-wasm.c
     schedule_background_exec,
 
+    //event pipe
+    mono_wasm_ipc_websocket_create,
+    mono_wasm_ipc_websocket_send,
+    mono_wasm_ipc_websocket_poll,
+    mono_wasm_ipc_websocket_recv,
+    mono_wasm_ipc_websocket_close,
+
     // interp.c and jiterpreter.c
     mono_interp_tier_prepare_jiterpreter,
     mono_interp_record_interp_entry,
@@ -83,7 +84,6 @@ export const mono_wasm_imports = [
     // driver.c
     mono_wasm_trace_logger,
     mono_wasm_set_entrypoint_breakpoint,
-    mono_wasm_event_pipe_early_startup_callback,
 
     // src/native/minipal/random.c
     mono_wasm_browser_entropy,

src/mono/browser/runtime/rollup.config.js

@@ -9,7 +9,6 @@ import * as path from "path";
 import { createHash } from "crypto";
 import dts from "rollup-plugin-dts";
 import { createFilter } from "@rollup/pluginutils";
-import fast_glob from "fast-glob";
 import gitCommitInfo from "git-commit-info";
 import MagicString from "magic-string";
 
@@ -21,13 +20,13 @@ const nativeBinDir = process.env.NativeBinDir ? process.env.NativeBinDir.replace
 const wasmObjDir = process.env.WasmObjDir ? process.env.WasmObjDir.replace(/"/g, "") : "obj";
 const wasmEnableThreads = process.env.WasmEnableThreads === "true" ? true : false;
 const wasmEnableSIMD = process.env.WASM_ENABLE_SIMD === "1" ? true : false;
+const wasmEnablePerfTracing = process.env.WASM_ENABLE_PERFTRACING === "1" ? true : false;
 const wasmEnableExceptionHandling = process.env.WASM_ENABLE_EH === "1" ? true : false;
 const wasmEnableJsInteropByValue = process.env.ENABLE_JS_INTEROP_BY_VALUE == "1" ? true : false;
-const monoDiagnosticsMock = process.env.MonoDiagnosticsMock === "true" ? true : false;
 // because of stack walk at src/mono/browser/debugger/BrowserDebugProxy/MonoProxy.cs
 // and unit test at with timers.mjs
 const keep_fnames = /(mono_wasm_runtime_ready|mono_wasm_fire_debugger_agent_message_with_data|mono_wasm_fire_debugger_agent_message_with_data_to_pause|mono_wasm_schedule_timer_tick)/;
-const keep_classnames = /(ManagedObject|ManagedError|Span|ArraySegment|WasmRootBuffer|SessionOptionsBuilder)/;
+const keep_classnames = /(ManagedObject|ManagedError|Span|ArraySegment)/;
 const terserConfig = {
     compress: {
         defaults: true,
@@ -110,8 +109,8 @@ const envConstants = {
     configuration,
     wasmEnableThreads,
     wasmEnableSIMD,
+    wasmEnablePerfTracing,
     wasmEnableExceptionHandling,
-    monoDiagnosticsMock,
     gitHash,
     wasmEnableJsInteropByValue,
     isContinuousIntegrationBuild,
@@ -237,51 +236,14 @@ if (isDebug) {
         banner: banner_dts,
         plugins: [alwaysLF(), writeOnChangePlugin()],
     });
-
-    // export types into the source code and commit to git
-    diagnosticMockTypesConfig = {
-        input: "./diagnostics/mock/export-types.ts",
-        output: [
-            {
-                format: "es",
-                file: "./diagnostics-mock.d.ts",
-                banner: banner_dts,
-                plugins: [alwaysLF(), writeOnChangePlugin()],
-            }
-        ],
-        external: externalDependencies,
-        plugins: [dts()],
-        onwarn: onwarn
-    };
-}
-
-/* Web Workers */
-function makeWorkerConfig (workerName, workerInputSourcePath) {
-    const workerConfig = {
-        input: workerInputSourcePath,
-        output: [
-            {
-                file: nativeBinDir + `/src/dotnet-${workerName}-worker.js`,
-                format: "iife",
-                banner,
-                plugins
-            },
-        ],
-        external: externalDependencies,
-        plugins: outputCodePlugins,
-    };
-    return workerConfig;
 }
 
-const workerConfigs = findWebWorkerInputs("./workers").map((workerInput) => makeWorkerConfig(workerInput.workerName, workerInput.path));
-
 const allConfigs = [
     loaderConfig,
     runtimeConfig,
     wasmImportsConfig,
     typesConfig,
 ]
-    .concat(workerConfigs)
     .concat(diagnosticMockTypesConfig ? [diagnosticMockTypesConfig] : []);
 export default defineConfig(allConfigs);
 
@@ -448,28 +410,6 @@ function regexReplace (replacements = []) {
     }
 }
 
-// Finds all files that look like a webworker toplevel input file in the given path.
-// Does not look recursively in subdirectories.
-// Returns an array of objects {"workerName": "foo", "path": "/path/dotnet-foo-worker.ts"}
-//
-// A file looks like a webworker toplevel input if it's `dotnet-{name}-worker.ts` or `.js`
-function findWebWorkerInputs (basePath) {
-    const glob = "dotnet-*-worker.[tj]s";
-    const files = fast_glob.sync(glob, { cwd: basePath });
-    if (files.length == 0) {
-        return [];
-    }
-    const re = /^dotnet-(.*)-worker\.[tj]s$/;
-    let results = [];
-    for (const file of files) {
-        const match = file.match(re);
-        if (match) {
-            results.push({ "workerName": match[1], "path": path.join(basePath, file) });
-        }
-    }
-    return results;
-}
-
 function onwarn (warning) {
     if (warning.code === "CIRCULAR_DEPENDENCY") {
         return;

src/mono/browser/runtime/startup.ts

@@ -32,7 +32,6 @@ import { localHeapViewU8, malloc } from "./memory";
 import { assertNoProxies } from "./gc-handles";
 import { runtimeList } from "./exports";
 import { nativeAbort, nativeExit } from "./run";
-import { mono_wasm_init_diagnostics } from "./diagnostics";
 import { replaceEmscriptenPThreadInit } from "./pthreads/worker-thread";
 
 export async function configureRuntimeStartup (module: DotnetModuleInternal): Promise<void> {
@@ -547,11 +546,6 @@ export async function start_runtime () {
         if (runtimeHelpers.config.logProfilerOptions)
             mono_wasm_init_log_profiler(runtimeHelpers.config.logProfilerOptions);
 
-        if (WasmEnableThreads) {
-            // this is not mono-attached thread, so we can start it earlier
-            await mono_wasm_init_diagnostics();
-        }
-
         mono_wasm_load_runtime();
 
         jiterpreter_allocate_tables();

src/mono/mono/component/CMakeLists.txt

@@ -76,7 +76,6 @@ set(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-sources
   ${diagnostic_server_sources}
   ${MONO_COMPONENT_PATH}/event_pipe.c
   ${MONO_COMPONENT_PATH}/event_pipe.h
-  ${MONO_COMPONENT_PATH}/event_pipe-wasm.h
   ${MONO_COMPONENT_PATH}/diagnostics_server.c
   ${MONO_COMPONENT_PATH}/diagnostics_server.h
   )