fix gcdump

Author: pavelsavara

src/mono/browser/runtime/diag/client-commands.ts

@@ -3,9 +3,12 @@
 
 import { SessionId } from "./common";
 
+export const advert1 = [65, 68, 86, 82, 95];
+export const dotnet_IPC_V1 = [68, 79, 84, 78, 69, 84, 95, 73, 80, 67, 95, 86, 49, 0];
+
 
 // this file contains the IPC commands that are sent by client (like dotnet-trace) to the diagnostic server (like Mono VM in the browser)
-// just formatting bytes, no sessions here
+// just formatting bytes, no sessions management here
 
 export function commandStopTracing (sessionID:SessionId) {
     return Uint8Array.from([
@@ -14,16 +17,26 @@ export function commandStopTracing (sessionID:SessionId) {
     ]);
 }
 
-export function createGcHeapDumpCommand () {
+export function commandResumeRuntime () {
+    return Uint8Array.from([
+        ...serializeHeader(CommandSetId.Process, ProcessCommandId.ResumeRuntime, computeMessageByteLength(0)),
+    ]);
+}
+
+export function commandGcHeapDump () {
     return commandCollectTracing2({
-        circularBufferMB: 256 * 1024 * 1024,
+        circularBufferMB: 256,
         format: 1,
         requestRundown: true,
         providers: [
             {
                 keywords: [
                     0x0000_0000,
-                    Keywords.GCHeapSnapshot,
+                    Keywords.GCHeapSnapshot, // 0x1980001
+                    // GC_HEAP_DUMP_VTABLE_CLASS_REF_KEYWORD 0x8000000
+                    // GC_FINALIZATION_KEYWORD               0x1000000
+                    // GC_HEAP_COLLECT_KEYWORD               0x0800000
+                    // GC_KEYWORD                            0x0000001
                 ],
                 logLevel: 5,
                 provider_name: "Microsoft-Windows-DotNETRuntime",
@@ -33,15 +46,23 @@ export function createGcHeapDumpCommand () {
     });
 }
 
-const enum CommandSetId {
-    Reserved = 0,
-    Dump = 1,
-    EventPipe = 2,
-    Profiler = 3,
-    Process = 4,
-
-    // replies
-    Server = 0xFF,
+function commandCollectTracing2 (payload2:PayloadV2) {
+    const payloadLength = computeCollectTracing2PayloadByteLength(payload2);
+    const messageLength = computeMessageByteLength(payloadLength);
+    const message = [
+        ...serializeHeader(CommandSetId.EventPipe, EventPipeCommandId.CollectTracing2, messageLength),
+        ...serializeUint32(payload2.circularBufferMB),
+        ...serializeUint32(payload2.format),
+        ...serializeUint8(payload2.requestRundown ? 1 : 0),
+        ...serializeUint32(payload2.providers.length),
+    ];
+    for (const provider of payload2.providers) {
+        message.push(...serializeUint64(provider.keywords));
+        message.push(...serializeUint32(provider.logLevel));
+        message.push(...serializeString(provider.provider_name));
+        message.push(...serializeString(provider.filter_data));
+    }
+    return Uint8Array.from(message);
 }
 
 const enum Keywords {
@@ -225,6 +246,17 @@ const enum Keywords {
     GCHeapSnapshot = 0x1980001
 }
 
+export const enum CommandSetId {
+    Reserved = 0,
+    Dump = 1,
+    EventPipe = 2,
+    Profiler = 3,
+    Process = 4,
+
+    // replies
+    Server = 0xFF,
+}
+
 const enum EventPipeCommandId {
     StopTracing= 1,
     CollectTracing= 2,
@@ -238,13 +270,13 @@ const enum ProcessCommandId {
     ProcessInfo2= 4,
 }
 
-const enum ServerCommandId {
+export const enum ServerCommandId {
     OK= 0,
     Error= 0xFF,
 }
 
 function serializeMagic () {
-    return Uint8Array.from("DOTNET_IPC_V1\0", (c) => c.codePointAt(0) ?? 0);
+    return Uint8Array.from(dotnet_IPC_V1);
 }
 
 function serializeUint8 (value:number) {
@@ -321,33 +353,14 @@ function computeCollectTracing2PayloadByteLength (payload2:PayloadV2) {
     return len;
 }
 
-export function commandCollectTracing2 (payload2:PayloadV2) {
-    const payloadLength = computeCollectTracing2PayloadByteLength(payload2);
-    const messageLength = computeMessageByteLength(payloadLength);
-    const message = [
-        ...serializeHeader(CommandSetId.EventPipe, EventPipeCommandId.CollectTracing2, messageLength),
-        ...serializeUint32(payload2.circularBufferMB),
-        ...serializeUint32(payload2.format),
-        ...serializeUint8(payload2.requestRundown ? 1 : 0),
-        ...serializeUint32(payload2.providers.length),
-    ];
-    for (const provider of payload2.providers) {
-        message.push(...serializeUint64(provider.keywords));
-        message.push(...serializeUint32(provider.logLevel));
-        message.push(...serializeString(provider.provider_name));
-        message.push(...serializeString(provider.filter_data));
-    }
-    return Uint8Array.from(message);
-}
-
-export type ProviderV2 ={
+type ProviderV2 ={
     keywords: [ 0, Keywords, ],
     logLevel: number,
     provider_name: string,
     filter_data: string|null
 }
 
-export type PayloadV2 = {
+type PayloadV2 = {
     circularBufferMB: number,
     format: number,
     requestRundown: boolean,

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

@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+import cwraps from "../cwraps";
+import { loaderHelpers, Module } from "../globals";
+import { VoidPtr } from "../types/emscripten";
+
+let lastScheduledTimeoutId: any = undefined;
+
+// run another cycle of the event loop, which is EP threads on MT runtime
+export function diagnostic_server_loop () {
+    lastScheduledTimeoutId = undefined;
+    if (loaderHelpers.is_runtime_running()) {
+        try {
+            cwraps.mono_background_exec();// give GC chance to run
+            cwraps.mono_ep_exec();
+        } catch (ex) {
+            loaderHelpers.mono_exit(1, ex);
+        }
+    }
+}
+
+export function schedule_diagnostic_server_loop ():void {
+    if (!lastScheduledTimeoutId) {
+        lastScheduledTimeoutId = Module.safeSetTimeout(diagnostic_server_loop, 100);
+    }
+}
+
+export class DiagConnectionBase {
+    protected messagesToSend: Uint8Array[] = [];
+    protected messagesReceived: Uint8Array[] = [];
+    constructor (public client_socket:number) {
+    }
+
+    store (message:Uint8Array):number {
+        this.messagesToSend.push(message);
+        return message.byteLength;
+    }
+
+    poll ():number {
+        return this.messagesReceived.length;
+    }
+
+    recv (buffer:VoidPtr, bytes_to_read:number):number {
+        if (this.messagesReceived.length === 0) {
+            return 0;
+        }
+        const message = this.messagesReceived[0]!;
+        const bytes_read = Math.min(message.length, bytes_to_read);
+        Module.HEAPU8.set(message.subarray(0, bytes_read), buffer as any);
+        if (bytes_read === message.length) {
+            this.messagesReceived.shift();
+        } else {
+            this.messagesReceived[0] = message.subarray(bytes_read);
+        }
+        return bytes_read;
+    }
+}
+
+export interface IDiagConnection {
+    send (message: Uint8Array):number ;
+    poll ():number ;
+    recv (buffer:VoidPtr, bytes_to_read:number):number ;
+    close ():number ;
+}
+
+// [hi,lo]
+export type SessionId=[number, number];