From: stephan <stephan@noemail.net>
Date: Wed, 30 Nov 2022 08:37:17 +0000 (+0000)
Subject: Simplify how the OPFS VFS async proxy copies initial state sent to it from the synchr... 
X-Git-Tag: version-3.41.0~345
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5141c9efa564dc6e6d39685b23741d6632dae5a;p=thirdparty%2Fsqlite.git

Simplify how the OPFS VFS async proxy copies initial state sent to it from the synchronous side of the connection. Make the lock-wait time a multiple of the wait-loop timeout interval.

FossilOrigin-Name: eddafafffa634a42ceeed70aa3fc58be130527612157a4bf4ff9e65c7f6dc26c
---

diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index 8bf34cc784..d8234d5092 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -298,7 +298,7 @@ const installAsyncProxy = function(self){
     if(!fh.syncHandle){
       const t = performance.now();
       log("Acquiring sync handle for",fh.filenameAbs);
-      const maxTries = 6, msBase = 300;
+      const maxTries = 6, msBase = state.asyncIdleWaitTime * 3;
       let i = 1, ms = msBase;
       for(; true; ms = msBase * ++i){
         try {
@@ -316,7 +316,6 @@ const installAsyncProxy = function(self){
           }
           warn("Error getting sync handle for",opName+"(). Waiting",ms,
                "ms and trying again.",fh.filenameAbs,e);
-          //await releaseImplicitLocks();
           Atomics.wait(state.sabOPView, state.opIds.retry, 0, ms);
         }
       }
@@ -835,17 +834,10 @@ const installAsyncProxy = function(self){
       o.key = k;
       o.f = vi;
     }
-    /**
-       waitTime is how long (ms) to wait for each Atomics.wait().
-       We need to wake up periodically to give the thread a chance
-       to do other things. If this is too high (e.g. 500ms) then
-       even two workers/tabs can easily run into locking errors.
-    */
-    const waitTime = 100;
     while(!flagAsyncShutdown){
       try {
         if('timed-out'===Atomics.wait(
-          state.sabOPView, state.opIds.whichOp, 0, waitTime
+          state.sabOPView, state.opIds.whichOp, 0, state.asyncIdleWaitTime
         )){
           await releaseImplicitLocks();
           continue;
@@ -874,20 +866,11 @@ const installAsyncProxy = function(self){
           case 'opfs-async-init':{
             /* Receive shared state from synchronous partner */
             const opt = data.args;
-            state.littleEndian = opt.littleEndian;
-            state.asyncS11nExceptions = opt.asyncS11nExceptions;
+            for(const k in opt) state[k] = opt[k];
             state.verbose = opt.verbose ?? 1;
-            state.fileBufferSize = opt.fileBufferSize;
-            state.sabS11nOffset = opt.sabS11nOffset;
-            state.sabS11nSize = opt.sabS11nSize;
-            state.sabOP = opt.sabOP;
             state.sabOPView = new Int32Array(state.sabOP);
-            state.sabIO = opt.sabIO;
             state.sabFileBufView = new Uint8Array(state.sabIO, 0, state.fileBufferSize);
             state.sabS11nView = new Uint8Array(state.sabIO, state.sabS11nOffset, state.sabS11nSize);
-            state.opIds = opt.opIds;
-            state.sq3Codes = opt.sq3Codes;
-            state.opfsFlags = opt.opfsFlags;
             Object.keys(vfsAsyncImpls).forEach((k)=>{
               if(!Number.isFinite(state.opIds[k])){
                 toss("Maintenance required: missing state.opIds[",k,"]");
diff --git a/ext/wasm/api/sqlite3-vfs-opfs.js b/ext/wasm/api/sqlite3-vfs-opfs.js
index bd258759c4..7b0a0b3228 100644
--- a/ext/wasm/api/sqlite3-vfs-opfs.js
+++ b/ext/wasm/api/sqlite3-vfs-opfs.js
@@ -268,6 +268,16 @@ const installOpfsVfs = function callee(options){
       // Int16Array uses the platform's endianness.
       return new Int16Array(buffer)[0] === 256;
     })();
+    /**
+       asyncIdleWaitTime is how long (ms) to wait, in the async proxy,
+       for each Atomics.wait() when waiting on inbound VFS API calls.
+       We need to wake up periodically to give the thread a chance to
+       do other things. If this is too high (e.g. 500ms) then even two
+       workers/tabs can easily run into locking errors. Some multiple
+       of this value is also used for determining how long to wait on
+       lock contention to free up.
+    */
+    state.asyncIdleWaitTime = 100;
     /**
        Whether the async counterpart should log exceptions to
        the serialization channel. That produces a great deal of
diff --git a/manifest b/manifest
index 8f95e10ebd..fe90f1f943 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C OPFS\sVFS:\sremove\san\sinvalid\sTODO\sand\sfix\sa\sproperty\sname\stypo\swhich\scaused\sxCheckReservedLock()\sto\salways\sreport\sfalse.
-D 2022-11-30T07:48:35.434
+C Simplify\show\sthe\sOPFS\sVFS\sasync\sproxy\scopies\sinitial\sstate\ssent\sto\sit\sfrom\sthe\ssynchronous\sside\sof\sthe\sconnection.\sMake\sthe\slock-wait\stime\sa\smultiple\sof\sthe\swait-loop\stimeout\sinterval.
+D 2022-11-30T08:37:17.860
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -508,9 +508,9 @@ F ext/wasm/api/sqlite3-api-oo1.js 06ad2079368e16cb9f182c18cd37bdc3932536856dff4f
 F ext/wasm/api/sqlite3-api-prologue.js e1db3935e1deb1340c1dc0c0e4730b2b88254d616841ebd5bc6bb1b90b32657f
 F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js efb0a7142c64c6a0f4cfbb588e6ea5baac9941364dfb0d40de2a21af1815bed3
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 9963c78bf6e5ccb5ba28e8597851bd9d980e86803b6d341cc985e586aef10c82
 F ext/wasm/api/sqlite3-vfs-helper.js 4ad4faf02e1524bf0296be8452c00b5708dce6faf649468d0377e26a0b299263
-F ext/wasm/api/sqlite3-vfs-opfs.js 6848abfd6dcc9e2e5ed99193929c735984c1784186d6130839ea5f5bcc7fd7df
+F ext/wasm/api/sqlite3-vfs-opfs.js 654f37fd6312d3bb0d067b21ad42f9dcfd629fd34ace892e67e06143a65dc6d0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 8b32787a3b6bb2990cbaba2304bd5b75a9652acbc8d29909b3279019b6cbaef5
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
@@ -2065,8 +2065,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 79832808de2cbdba140ed9e0558f1502b51d131ab4315265315922cda7b748cb
-R d6a46579cca1740ff67e566c55a1e4a7
+P 3b037caa2fa07b6c44c485574e9e5dc71f4a8e82bc902c1321bb0b918b139c74
+R e3e2fc506276773f57deed8b914e8dd1
 U stephan
-Z c6b01228f796eacb2c5dcc52cd57eff3
+Z 98f64cec6c8eaf42e6c02ddc6003f146
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3a518c054a..20dcd52ad4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3b037caa2fa07b6c44c485574e9e5dc71f4a8e82bc902c1321bb0b918b139c74
\ No newline at end of file
+eddafafffa634a42ceeed70aa3fc58be130527612157a4bf4ff9e65c7f6dc26c
\ No newline at end of file