Files
luanti-wasm/emsdk_wasmfs_opfs.patch

179 lines
8.2 KiB
Diff

--- emsdk-orig/upstream/emscripten/src/lib/libwasmfs_opfs.js
+++ emsdk/upstream/emscripten/src/lib/libwasmfs_opfs.js
@@ -5,6 +5,13 @@
*/
addToLibrary({
+ // `__async: 'auto'` below means "async when JSPI is doing the waiting".
+ // With PTHREADS the waiting is done by the proxying queue instead: the
+ // functions run on the dedicated OPFS worker and report completion through
+ // wasmfsOPFSProxyFinish(). That worker sits in its event loop rather than
+ // inside a WebAssembly.promising() call, so a JSPI suspension there fails
+ // with "trying to suspend without WebAssembly.promising". Keep them
+ // un-instrumented whenever pthreads are available, even in a -sJSPI build.
$wasmfsOPFSDirectoryHandles__deps: ['$HandleAllocator'],
$wasmfsOPFSDirectoryHandles: 'new HandleAllocator()',
$wasmfsOPFSFileHandles__deps: ['$HandleAllocator'],
@@ -69,7 +76,7 @@
},
_wasmfs_opfs_init_root_directory__deps: ['$wasmfsOPFSDirectoryHandles', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_init_root_directory__async: 'auto',
+ _wasmfs_opfs_init_root_directory__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_init_root_directory: async (ctx) => {
// allocated.length starts off as 1 since 0 is a reserved handle
if (wasmfsOPFSDirectoryHandles.allocated.length == 1) {
@@ -136,7 +143,7 @@
_wasmfs_opfs_get_child__deps: ['$wasmfsOPFSGetOrCreateFile',
'$wasmfsOPFSGetOrCreateDir', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_get_child__async: 'auto',
+ _wasmfs_opfs_get_child__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_get_child: async (ctx, parent, namePtr, childTypePtr, childIDPtr) => {
let name = UTF8ToString(namePtr);
let childType = 1;
@@ -156,7 +163,7 @@
'$stackRestore',
'_wasmfs_opfs_record_entry',
],
- _wasmfs_opfs_get_entries__async: 'auto',
+ _wasmfs_opfs_get_entries__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_get_entries: async (ctx, dirID, entriesPtr, errPtr) => {
let dirHandle = wasmfsOPFSDirectoryHandles.get(dirID);
@@ -181,7 +188,7 @@
},
_wasmfs_opfs_insert_file__deps: ['$wasmfsOPFSGetOrCreateFile', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_insert_file__async: 'auto',
+ _wasmfs_opfs_insert_file__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_insert_file: async (ctx, parent, namePtr, childIDPtr) => {
let name = UTF8ToString(namePtr);
let childID = await wasmfsOPFSGetOrCreateFile(parent, name, true);
@@ -190,7 +197,7 @@
},
_wasmfs_opfs_insert_directory__deps: ['$wasmfsOPFSGetOrCreateDir', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_insert_directory__async: 'auto',
+ _wasmfs_opfs_insert_directory__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_insert_directory: async (ctx, parent, namePtr, childIDPtr) => {
let name = UTF8ToString(namePtr);
let childID = await wasmfsOPFSGetOrCreateDir(parent, name, true);
@@ -201,7 +208,7 @@
_wasmfs_opfs_move_file__deps: ['$wasmfsOPFSFileHandles',
'$wasmfsOPFSDirectoryHandles',
'$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_move_file__async: 'auto',
+ _wasmfs_opfs_move_file__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_move_file: async (ctx, fileID, newParentID, namePtr, errPtr) => {
let name = UTF8ToString(namePtr);
let fileHandle = wasmfsOPFSFileHandles.get(fileID);
@@ -216,7 +223,7 @@
},
_wasmfs_opfs_remove_child__deps: ['$wasmfsOPFSDirectoryHandles', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_remove_child__async: 'auto',
+ _wasmfs_opfs_remove_child__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_remove_child: async (ctx, dirID, namePtr, errPtr) => {
let name = UTF8ToString(namePtr);
let dirHandle = wasmfsOPFSDirectoryHandles.get(dirID);
@@ -245,7 +252,7 @@
'$wasmfsOPFSCreateAsyncAccessHandle'
#endif
],
- _wasmfs_opfs_open_access__async: 'auto',
+ _wasmfs_opfs_open_access__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_open_access: async (ctx, fileID, accessIDPtr) => {
let fileHandle = wasmfsOPFSFileHandles.get(fileID);
let accessID;
@@ -285,7 +292,7 @@
_wasmfs_opfs_open_blob__deps: ['$wasmfsOPFSFileHandles',
'$wasmfsOPFSBlobs', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_open_blob__async: 'auto',
+ _wasmfs_opfs_open_blob__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_open_blob: async (ctx, fileID, blobIDPtr) => {
let fileHandle = wasmfsOPFSFileHandles.get(fileID);
let blobID;
@@ -307,7 +314,7 @@
},
_wasmfs_opfs_close_access__deps: ['$wasmfsOPFSAccessHandles', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_close_access__async: 'auto',
+ _wasmfs_opfs_close_access__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_close_access: async (ctx, accessID, errPtr) => {
let accessHandle = wasmfsOPFSAccessHandles.get(accessID);
try {
@@ -327,7 +334,7 @@
_wasmfs_opfs_read_access__i53abi: true,
_wasmfs_opfs_read_access__deps: ['$wasmfsOPFSAccessHandles'],
- _wasmfs_opfs_read_access__async: 'auto',
+ _wasmfs_opfs_read_access__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_read_access: {{{ asyncIf(!PTHREADS) }}}(accessID, bufPtr, len, pos) => {
let accessHandle = wasmfsOPFSAccessHandles.get(accessID);
let data = HEAPU8.subarray(bufPtr, bufPtr + len);
@@ -346,7 +353,7 @@
_wasmfs_opfs_read_blob__i53abi: true,
_wasmfs_opfs_read_blob__deps: ['$wasmfsOPFSBlobs', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_read_blob__async: 'auto',
+ _wasmfs_opfs_read_blob__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_read_blob: async (ctx, blobID, bufPtr, len, pos, nreadPtr) => {
let blob = wasmfsOPFSBlobs.get(blobID);
let slice = blob.slice(pos, pos + len);
@@ -377,7 +384,7 @@
_wasmfs_opfs_write_access__i53abi: true,
_wasmfs_opfs_write_access__deps: ['$wasmfsOPFSAccessHandles'],
- _wasmfs_opfs_write_access__async: 'auto',
+ _wasmfs_opfs_write_access__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_write_access: {{{ asyncIf(!PTHREADS) }}}(accessID, bufPtr, len, pos) => {
let accessHandle = wasmfsOPFSAccessHandles.get(accessID);
let data = HEAPU8.subarray(bufPtr, bufPtr + len);
@@ -395,7 +402,7 @@
},
_wasmfs_opfs_get_size_access__deps: ['$wasmfsOPFSAccessHandles', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_get_size_access__async: 'auto',
+ _wasmfs_opfs_get_size_access__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_get_size_access: async (ctx, accessID, sizePtr) => {
let accessHandle = wasmfsOPFSAccessHandles.get(accessID);
let size;
@@ -416,7 +423,7 @@
},
_wasmfs_opfs_get_size_file__deps: ['$wasmfsOPFSFileHandles', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_get_size_file__async: 'auto',
+ _wasmfs_opfs_get_size_file__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_get_size_file: async (ctx, fileID, sizePtr) => {
let fileHandle = wasmfsOPFSFileHandles.get(fileID);
let size;
@@ -431,7 +438,7 @@
_wasmfs_opfs_set_size_access__i53abi: true,
_wasmfs_opfs_set_size_access__deps: ['$wasmfsOPFSAccessHandles', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_set_size_access__async: 'auto',
+ _wasmfs_opfs_set_size_access__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_set_size_access: async (ctx, accessID, size, errPtr) => {
let accessHandle = wasmfsOPFSAccessHandles.get(accessID);
try {
@@ -445,7 +452,7 @@
_wasmfs_opfs_set_size_file__i53abi: true,
_wasmfs_opfs_set_size_file__deps: ['$wasmfsOPFSFileHandles', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_set_size_file__async: 'auto',
+ _wasmfs_opfs_set_size_file__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_set_size_file: async (ctx, fileID, size, errPtr) => {
let fileHandle = wasmfsOPFSFileHandles.get(fileID);
try {
@@ -460,7 +467,7 @@
},
_wasmfs_opfs_flush_access__deps: ['$wasmfsOPFSAccessHandles', '$wasmfsOPFSProxyFinish'],
- _wasmfs_opfs_flush_access__async: 'auto',
+ _wasmfs_opfs_flush_access__async: {{{ PTHREADS ? "false" : "'auto'" }}},
_wasmfs_opfs_flush_access: async (ctx, accessID, errPtr) => {
let accessHandle = wasmfsOPFSAccessHandles.get(accessID);
try {