From db37b563764b654d29b373abd28bc0c9aba36914 Mon Sep 17 00:00:00 2001 From: Alexander Guryanov Date: Tue, 22 Oct 2024 12:08:27 +0300 Subject: [PATCH] v8.3.1: sockdrive cache issues fixed --- native/sockdrive | 2 +- package.json | 2 +- src/build.ts | 12 ++++++------ src/dos/dosbox/cpp/worker-protocol.cpp | 2 ++ src/protocol/protocol.ts | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/native/sockdrive b/native/sockdrive index 3ba5b58..e4d1d35 160000 --- a/native/sockdrive +++ b/native/sockdrive @@ -1 +1 @@ -Subproject commit 3ba5b58e08059ca75acc1830a3227be593441b4d +Subproject commit e4d1d354819dd5c59eb83831613c08aee6451744 diff --git a/package.json b/package.json index 99aecf5..b2c4c21 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "emulators", - "version": "8.3.0", + "version": "8.3.1", "description": "Emulators (dos) with standartized API", "main": "dist/emulators.js", "types": "dist/types/emulators.d.ts", diff --git a/src/build.ts b/src/build.ts index 38ef666..6b00919 100644 --- a/src/build.ts +++ b/src/build.ts @@ -5,22 +5,22 @@ // gulpfile.ts/wasm.ts --> generateBuildInfo export const Build = { - version: "8.2.2 (f68ad59ec707afe7aad49388c3368269)", - buildSeed: 1729090845648, + version: "8.3.0 (c9c7a9bcadf2953a525750e3b8d347e0)", + buildSeed: 1729587869354, "wdosbox-x.wasm": { - "size": 6293112, + "size": 6316939, "gzSize": 0 }, "wdosbox-x.js": { - "size": 225415, + "size": 225479, "gzSize": 0 }, "wdosbox.wasm": { - "size": 1478555, + "size": 1502217, "gzSize": 0 }, "wdosbox.js": { - "size": 102955, + "size": 103037, "gzSize": 0 }, "wlibzip.wasm": { diff --git a/src/dos/dosbox/cpp/worker-protocol.cpp b/src/dos/dosbox/cpp/worker-protocol.cpp index 7d09c15..b4c7428 100644 --- a/src/dos/dosbox/cpp/worker-protocol.cpp +++ b/src/dos/dosbox/cpp/worker-protocol.cpp @@ -231,6 +231,7 @@ EM_JS(void, ws_init_runtime, (const char* sessionId, const char* sockdriveImpl), driveCacheHit: 0, driveCacheMiss: 0, driveCacheUsed: 0, + driveBufferedAmount: 0, driveIo: [], }; @@ -241,6 +242,7 @@ EM_JS(void, ws_init_runtime, (const char* sessionId, const char* sockdriveImpl), stats.driveCacheHit = Module.sockdrive.stats.cacheHit; stats.driveCacheMiss = Module.sockdrive.stats.cacheMiss; stats.driveCacheUsed = Module.sockdrive.stats.cacheUsed; + stats.driveBufferedAmount = Module.sockdrive.bufferedAmount(); stats.driveIo = Module.sockdrive.stats.io; } diff --git a/src/protocol/protocol.ts b/src/protocol/protocol.ts index 391d6e0..14704aa 100644 --- a/src/protocol/protocol.ts +++ b/src/protocol/protocol.ts @@ -91,6 +91,7 @@ export interface AsyncifyStats { driveCacheHit: number, driveCacheMiss: number, driveCacheUsed: number, + driveBufferedAmount: number, driveIo: { read: number, write: number }[]; }