From: stephan Date: Mon, 3 Oct 2022 09:21:37 +0000 (+0000) Subject: OPFS VFS now lazily opens its sync access handle, as a step towards experimenting... X-Git-Tag: version-3.40.0~169^2~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ff8da876d147f8bc15814bc172e78c43a5afb8f;p=thirdparty%2Fsqlite.git OPFS VFS now lazily opens its sync access handle, as a step towards experimenting with relinquishing it during idle times to help avoid cross-tab and page-reload locking issues. FossilOrigin-Name: a984e1ba435731413a541f86c50232bc7d6e33aff6ba4cca90f89188e7b82a2c --- diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js index bbd5b446f0..e31618d5eb 100644 --- a/ext/wasm/api/sqlite3-api-glue.js +++ b/ext/wasm/api/sqlite3-api-glue.js @@ -24,27 +24,32 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ self.WhWasmUtilInstaller(capi.wasm); delete self.WhWasmUtilInstaller; + /** + Install JS<->C struct bindings for the non-opaque struct types we + need... */ + sqlite3.StructBinder = self.Jaccwabyt({ + heap: 0 ? wasm.memory : wasm.heap8u, + alloc: wasm.alloc, + dealloc: wasm.dealloc, + functionTable: wasm.functionTable, + bigIntEnabled: wasm.bigIntEnabled, + memberPrefix: '$' + }); + delete self.Jaccwabyt; + if(0){ - /* "The problem" is that the following isn't type-safe. - OTOH, nothing about WASM pointers is. */ - /** - Add the `.pointer` xWrap() signature entry to extend the - `pointer` arg handler to check for a `pointer` property. This - can be used to permit, e.g., passing an sqlite3.oo1.DB instance - to a C-style sqlite3_xxx function which takes an `sqlite3*` - argument. - */ - const xPointer = wasm.xWrap.argAdapter('pointer'); - const adapter = function(v){ - if(v && v.constructor){ - const x = v.pointer; - if(Number.isInteger(x)) return x; - else toss("Invalid (object) type for .pointer-type argument."); + /* "The problem" is that the following isn't even remotely + type-safe. OTOH, nothing about WASM pointers is. */ + const argPointer = wasm.xWrap.argAdapter('*'); + wasm.xWrap.argAdapter('StructType', (v)=>{ + if(v && v.constructor && v instanceof StructBinder.StructType){ + v = v.pointer; } - return xPointer(v); - }; - wasm.xWrap.argAdapter('.pointer', adapter); - } /* ".pointer" xWrap() argument adapter */ + return (v === (v | 0) /* v is a 32-bit integer */) + ? argPointer(v) + : toss("Invalid (object) type for StructType-type argument."); + }); + } if(1){/* Convert Arrays and certain TypedArrays to strings for 'flexible-string'-type arguments */ @@ -605,19 +610,6 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ }; }/*wasm.pstack filler*/ - /** - Install JS<->C struct bindings for the non-opaque struct types we - need... */ - sqlite3.StructBinder = self.Jaccwabyt({ - heap: 0 ? wasm.memory : wasm.heap8u, - alloc: wasm.alloc, - dealloc: wasm.dealloc, - functionTable: wasm.functionTable, - bigIntEnabled: wasm.bigIntEnabled, - memberPrefix: '$' - }); - delete self.Jaccwabyt; - {/* Import C-level constants and structs... */ const cJson = wasm.xCall('sqlite3_wasm_enum_json'); if(!cJson){ diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js index a0da492b08..c98b7cea4d 100644 --- a/ext/wasm/common/whwasmutil.js +++ b/ext/wasm/common/whwasmutil.js @@ -371,16 +371,16 @@ self.WhWasmUtilInstaller = function(target){ /** Creates a WASM function which wraps the given JS function and returns the JS binding of that WASM function. The signature - argument must be the Jaccwabyt-format or Emscripten + string must be the Jaccwabyt-format or Emscripten addFunction()-format function signature string. In short: in may have one of the following formats: - - Emscripten: `x...`, where the first x is a letter representing + - Emscripten: `"x..."`, where the first x is a letter representing the result type and subsequent letters represent the argument types. Functions with no arguments have only a single letter. See below. - - Jaccwabyt: `x(...)` where `x` is the letter representing the + - Jaccwabyt: `"x(...)"` where `x` is the letter representing the result type and letters in the parens (if any) represent the argument types. Functions with no arguments use `x()`. See below. @@ -451,9 +451,9 @@ self.WhWasmUtilInstaller = function(target){ // is not yet documented on MDN. sigToWasm: function(sig){ const rc = {parameters:[], results: []}; - if('v'!==sig[0]) rc.results.push(f._.letterType(sig[0])); + if('v'!==sig[0]) rc.results.push(f.sigTypes(sig[0])); for(const x of f._.sigParams(sig)){ - rc.parameters.push(f._.letterType(x)); + rc.parameters.push(f._.typeCodes(x)); } return rc; },************/ diff --git a/ext/wasm/sqlite3-opfs-async-proxy.js b/ext/wasm/sqlite3-opfs-async-proxy.js index 025cd97a4e..b19568d637 100644 --- a/ext/wasm/sqlite3-opfs-async-proxy.js +++ b/ext/wasm/sqlite3-opfs-async-proxy.js @@ -25,6 +25,13 @@ access to the sqlite3 JS/WASM bits, so any bits which it needs (most notably SQLITE_xxx integer codes) have to be imported into it via an initialization process. + + Potential TODOs: + + - When idle for "a long time", close the sync access handle in order + to release the lock, then re-open it on demand. Similarly, delay + fetching of the sync access handle until we need it. The intent + would be to help multi-tab access to a db avoid locking issues. */ 'use strict'; const toss = function(...args){throw new Error(args.join(' '))}; @@ -132,6 +139,17 @@ const getDirForFilename = async function f(absFilename, createDirs = false){ return [dh, filename]; }; +/** + Returns the sync access handle associated with the given file + handle object (which must be a valid handle object), lazily opening + it if needed. +*/ +const getSyncHandle = async (f)=>( + f.accessHandle || ( + f.accessHandle = + await f.fileHandle.createSyncAccessHandle() + ) +); /** Stores the given value at state.sabOPView[state.opIds.rc] and then @@ -294,7 +312,7 @@ const vfsAsyncImpls = { let sz; wTimeStart('xFileSize'); try{ - sz = await fh.accessHandle.getSize(); + sz = await (await getSyncHandle(fh)).getSize(); state.s11n.serialize(Number(sz)); sz = 0; }catch(e){ @@ -322,23 +340,24 @@ const vfsAsyncImpls = { return; } const hFile = await hDir.getFileHandle(filenamePart, {create}); - const fobj = Object.create(null); /** wa-sqlite, at this point, grabs a SyncAccessHandle and assigns it to the accessHandle prop of the file state object, but only for certain cases and it's unclear why it places that limitation on it. */ - fobj.accessHandle = await hFile.createSyncAccessHandle(); wTimeEnd(); + const fobj = Object.assign(Object.create(null),{ + filenameAbs: filename, + filenamePart: filenamePart, + dirHandle: hDir, + fileHandle: hFile, + sabView: state.sabFileBufView, + readOnly: create + ? false : (state.sq3Codes.SQLITE_OPEN_READONLY & flags), + deleteOnClose: deleteOnClose + }); __openFiles[fid] = fobj; - fobj.filenameAbs = filename; - fobj.filenamePart = filenamePart; - fobj.dirHandle = hDir; - fobj.fileHandle = hFile; - fobj.sabView = state.sabFileBufView; - fobj.readOnly = create ? false : (state.sq3Codes.SQLITE_OPEN_READONLY & flags); - fobj.deleteOnClose = deleteOnClose; storeAndNotify(opName, 0); }catch(e){ wTimeEnd(); @@ -354,7 +373,7 @@ const vfsAsyncImpls = { try{ const fh = __openFiles[fid]; wTimeStart('xRead'); - const nRead = fh.accessHandle.read( + const nRead = (await getSyncHandle(fh)).read( fh.sabView.subarray(0, n), {at: Number(offset)} ); @@ -395,7 +414,7 @@ const vfsAsyncImpls = { wTimeStart('xTruncate'); try{ affirmNotRO('xTruncate', fh); - await fh.accessHandle.truncate(size); + await (await getSyncHandle(fh)).truncate(size); }catch(e){ error("xTruncate():",e,fh); state.s11n.storeException(2,e); @@ -413,8 +432,9 @@ const vfsAsyncImpls = { const fh = __openFiles[fid]; affirmNotRO('xWrite', fh); rc = ( - n === fh.accessHandle.write(fh.sabView.subarray(0, n), - {at: Number(offset)}) + n === (await getSyncHandle(fh)) + .write(fh.sabView.subarray(0, n), + {at: Number(offset)}) ) ? 0 : state.sq3Codes.SQLITE_IOERR_WRITE; }catch(e){ error("xWrite():",e,fh); diff --git a/manifest b/manifest index 5911be300e..636679809f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Partial\srevert\sof\s[a82e6faaa642]\sto\sremove\sthe\s'I'\salias\sfor\s'j'\swasm\sfunction\ssignature\sletter.\sIn\shindsight,\sthat\schange\sseems\spremature. -D 2022-10-03T08:30:22.681 +C OPFS\sVFS\snow\slazily\sopens\sits\ssync\saccess\shandle,\sas\sa\sstep\stowards\sexperimenting\swith\srelinquishing\sit\sduring\sidle\stimes\sto\shelp\savoid\scross-tab\sand\spage-reload\slocking\sissues. +D 2022-10-03T09:21:37.209 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -485,7 +485,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814 F ext/wasm/api/post-js-header.js 2e5c886398013ba2af88028ecbced1e4b22dc96a86467f1ecc5ba9e64ef90a8b F ext/wasm/api/pre-js.js 2db711eb637991b383fc6b5c0f3df65ec48a7201e5730e304beba8de2d3f9b0b F ext/wasm/api/sqlite3-api-cleanup.js 5d22d1d3818ecacb23bfa223d5970cd0617d8cdbb48c8bc4bbd463f05b021a99 -F ext/wasm/api/sqlite3-api-glue.js df974b8a8374ec5f0e25b6a891401f07804471008a1a655717bb86cf7fc899ff +F ext/wasm/api/sqlite3-api-glue.js 5391338550ef9fafb3a7a6d060b8c19a190c47c01fa14e032c6e30dd96742c02 F ext/wasm/api/sqlite3-api-oo1.js 484f9ea5c7140d07745f4b534a1f6dd67120c65ef34abcf7cdb3a388d73f5ef4 F ext/wasm/api/sqlite3-api-opfs.js 1b097808b7b081b0f0700cf97d49ef19760e401706168edff9cd45cf9169f541 F ext/wasm/api/sqlite3-api-prologue.js b827e2353799b54fffaa9577f51ebf08b8dedc58dcabe344c73be977235da227 @@ -497,7 +497,7 @@ F ext/wasm/batch-runner.js ce92650a6681586c89bef26ceae96674a55ca5a9727815202ca62 F ext/wasm/common/SqliteTestUtil.js 647bf014bd30bdd870a7e9001e251d12fc1c9ec9ce176a1004b838a4b33c5c05 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f F ext/wasm/common/testing.css 3a5143699c2b73a85b962271e1a9b3241b30d90e30d895e4f55665e648572962 -F ext/wasm/common/whwasmutil.js 8a0557f2b8b0e2c2671072e9d8869c1591db59995de81eb8eca47d6c5d8457d9 +F ext/wasm/common/whwasmutil.js bc8522a071f4754af7b50f53807b95f691d2f9e44fc3b3e8c65dff6ef2485c0d F ext/wasm/demo-123-worker.html e419b66495d209b5211ec64903b4cfb3ca7df20d652b41fcd28bf018a773234f F ext/wasm/demo-123.html aa281d33b7eefa755f3122b7b5a18f39a42dc5fb69c8879171bf14b4c37c4ec4 F ext/wasm/demo-123.js 9fbc5cd3af842d361e9f8353ae4af9f471c2b2517e55446474406620485b9ee6 @@ -522,7 +522,7 @@ F ext/wasm/speedtest1.html e4cb5d722b494104fc1249e7c008ca018f820a784833c51004c95 F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0 F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5 -F ext/wasm/sqlite3-opfs-async-proxy.js 7367733ce409c8106b6c49e8ef2b55440e9974a64f39e0c97f5e3a4587d1fc2a +F ext/wasm/sqlite3-opfs-async-proxy.js 4894fc7767d3ac3cd4b9e377585ad0f07f0fc7da7cf47b8fd302454082908715 F ext/wasm/sqlite3-worker1-promiser.js 307d7837420ca6a9d3780dfc81194f1c0715637e6d9540e935514086b96913d8 F ext/wasm/sqlite3-worker1.js 466e9bd39409ab03f3e00999887aaffc11e95b416e2689596e3d7f1516673fdf F ext/wasm/test-opfs-vfs.html eb69dda21eb414b8f5e3f7c1cc0f774103cc9c0f87b2d28a33419e778abfbab5 @@ -2029,8 +2029,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a82e6faaa642b09d241232c4daa67134d4dfa24bf3ca3725740346ca5269b381 -R 1cdb3ca834e236e54389a61ca1f0d059 +P dcd46af9141f4edf816010923941a76d0edd3f18cfe429c52f599ad2a0d52651 +R 3c3f3eb77f5b518716e3c0c05a085b7f U stephan -Z ee5810e1e70af12e58974dd2bc072e0d +Z f31e491aa10bb32231c16589c3c07643 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 14f055aaae..f589fca814 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -dcd46af9141f4edf816010923941a76d0edd3f18cfe429c52f599ad2a0d52651 \ No newline at end of file +a984e1ba435731413a541f86c50232bc7d6e33aff6ba4cca90f89188e7b82a2c \ No newline at end of file