fix json

Author: elringus

samples/bench/bench.mjs

@@ -3,6 +3,7 @@ import { init as initDotNet } from "./dotnet/init.mjs";
 import { init as initDotNetLLVM } from "./dotnet-llvm/init.mjs";
 import { init as initGo } from "./go/init.mjs";
 import { init as initRust } from "./rust/init.mjs";
+import * as fixtures from "./fixtures.mjs";
 
 /**
  * @typedef {Object} Exports
@@ -12,7 +13,7 @@ import { init as initRust } from "./rust/init.mjs";
  */
 
 const lang = process.argv[2];
-const baseline = [];
+const baseline = new Map;
 
 if (!lang || lang.toLowerCase() === "rust")
     await run("Rust", await initRust());
@@ -29,23 +30,37 @@ if (!lang || lang.toLowerCase() === "go")
  *  @param {Exports} exports */
 async function run(lang, exports) {
     console.log(`\n\nBenching ${lang}...\n`);
-    console.log(`Echo number: ${iterate(0, exports.echoNumber, 100, 3, 1000)}`);
-    console.log(`Echo struct: ${iterate(1, exports.echoStruct, 100, 3, 100)}`);
-    console.log(`Fibonacci: ${iterate(2, () => exports.fi(33), 100, 3, 1)}`);
+    await new Promise(r => setTimeout(r, 100));
+    bench("Echo number", exports.echoNumber, 100, 3, 1000, fixtures.getNumber());
+    bench("Echo struct", exports.echoStruct, 100, 3, 100, fixtures.getStruct());
+    bench("Fibonacci", () => exports.fi(33), 100, 3, 1);
 }
 
-function iterate(idx, fn, iterations, warms, loops) {
+function bench(name, fn, iters, warms, loops, expected = undefined) {
+    if (expected) {
+        expected = JSON.stringify(expected);
+        const actual = JSON.stringify(fn());
+        if (actual !== expected) {
+            console.error(`Wrong result of '${name}'. Expected: ${expected} Actual: ${actual}`);
+            return;
+        }
+    }
+
     const results = [];
     warms *= -1;
-    for (let i = warms; i < iterations; i++) {
+    for (let i = warms; i < iters; i++) {
         const start = performance.now();
         for (let l = 0; l < loops; l++) fn();
         if (i >= 0) results.push(performance.now() - start);
     }
     let media = median(results);
-    if (baseline[idx]) return `${(media / baseline[idx]).toFixed(1)}`;
-    else baseline[idx] = media;
-    return `${media.toFixed(3)} ms`;
+
+    if (baseline.has(name)) {
+        console.log(`${name}: ${(media / baseline.get(name)).toFixed(1)}`);
+    } else {
+        baseline.set(name, media);
+        console.log(`${name}: ${media.toFixed(3)} ms`);
+    }
 }
 
 function median(numbers) {

samples/bench/dotnet-llvm/Program.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.JavaScript;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -16,7 +14,7 @@ public struct Data
 [JsonSourceGenerationOptions(JsonSerializerDefaults.Web)]
 internal partial class SourceGenerationContext : JsonSerializerContext;
 
-public static unsafe partial class Program
+public static unsafe class Program
 {
     public static void Main () { }
 
@@ -26,12 +24,16 @@ public static void Main () { }
     [UnmanagedCallersOnly(EntryPoint = "echoNumber")]
     public static int EchoNumber () => GetNumber();
 
-    [JSExport]
-    public static string EchoStruct ()
+    [UnmanagedCallersOnly(EntryPoint = "echoStruct")]
+    public static byte* EchoStruct ()
     {
-        var span = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(GetStruct());
-        var data = JsonSerializer.Deserialize(span, SourceGenerationContext.Default.Data);
-        return JsonSerializer.Serialize(data, SourceGenerationContext.Default.Data);
+        var inSpan = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(GetStruct());
+        var inData = JsonSerializer.Deserialize(inSpan, SourceGenerationContext.Default.Data);
+        var bytes = JsonSerializer.SerializeToUtf8Bytes(inData, SourceGenerationContext.Default.Data);
+        var ptr = Marshal.AllocHGlobal(bytes.Length + 1);
+        Marshal.Copy(bytes, 0, ptr, bytes.Length);
+        ((byte*)ptr)![bytes.Length] = 0; // add null terminator to the string
+        return (byte*)ptr;
     }
 
     [UnmanagedCallersOnly(EntryPoint = "fi")]

samples/bench/dotnet-llvm/init.mjs

@@ -3,12 +3,11 @@ import { dotnet } from "./bin/Release/net9.0-browser/browser-wasm/publish/dotnet
 /** @returns {Promise<import("../bench.mjs").Exports>} */
 export async function init() {
     const runtime = await dotnet.withDiagnosticTracing(false).create();
-    const asm = "DotNetLLVM";
-    await runtime.runMain(asm, []);
-    const exports = await runtime.getAssemblyExports(asm);
+    await runtime.runMain("DotNetLLVM", []);
+
     return {
         echoNumber: runtime.Module._echoNumber,
-        echoStruct: exports.Program.EchoStruct,
+        echoStruct: () => JSON.parse(runtime.Module.UTF8ToString(runtime.Module._echoStruct())),
         fi: runtime.Module._fi
     };
 }

samples/bench/dotnet/init.mjs

@@ -16,7 +16,7 @@ export async function init() {
     const exports = await runtime.getAssemblyExports(asm);
     return {
         echoNumber: exports.Program.EchoNumber,
-        echoStruct: exports.Program.EchoStruct,
+        echoStruct: () => JSON.parse(exports.Program.EchoStruct()),
         fi: exports.Program.Fi
     };
 }

samples/bench/go/init.mjs

@@ -14,7 +14,7 @@ export async function init() {
 
     return {
         echoNumber: global.echoNumber,
-        echoStruct: global.echoStruct,
+        echoStruct: () => JSON.parse(global.echoStruct()),
         fi: global.fi
     };
 }

samples/bench/go/main.go

@@ -6,10 +6,10 @@ import (
 )
 
 type Data struct {
-  Info     string   `json:"Info"`
-  Ok       bool     `json:"Ok"`
-  Revision int      `json:"Revision"`
-  Messages []string `json:"Messages"`
+  Info     string   `json:"info"`
+  Ok       bool     `json:"ok"`
+  Revision int      `json:"revision"`
+  Messages []string `json:"messages"`
 }
 
 func main() {

samples/bench/rust/init.mjs

@@ -5,5 +5,9 @@ import { getNumber, getStruct } from "../fixtures.mjs";
 export async function init() {
     global.getNumber = getNumber;
     global.getStruct = () => JSON.stringify(getStruct());
-    return { echoNumber, echoStruct, fi };
+    return { 
+        echoNumber, 
+        echoStruct: () => JSON.parse(echoStruct()), 
+        fi 
+    };
 }