From: stephan <stephan@noemail.net>
Date: Wed, 30 Nov 2022 03:08:50 +0000 (+0000)
Subject: Doc and logging text tweaks in the OPFS async proxy and test app.
X-Git-Tag: version-3.41.0~349
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0945f4638f342daf4c84ab5a03449137435dd36;p=thirdparty%2Fsqlite.git

Doc and logging text tweaks in the OPFS async proxy and test app.

FossilOrigin-Name: 7ce8608e221924d2c7067687eb6eef0f3cab181d5b4132e55a67d8514b6ce94b
---

diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index a80eeb2903..da75f139c9 100644
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -287,11 +287,12 @@ const installAsyncProxy = function(self){
      handle object (which must be a valid handle object, as created by
      xOpen()), lazily opening it if needed.
 
-     In order to help alleviate cross-tab contention for a dabase,
-     if an exception is thrown while acquiring the handle, this routine
-     will wait briefly and try again, up to 3 times. If acquisition
-     still fails at that point it will give up and propagate the
-     exception.
+     In order to help alleviate cross-tab contention for a dabase, if
+     an exception is thrown while acquiring the handle, this routine
+     will wait briefly and try again, up to some fixed number of
+     times. If acquisition still fails at that point it will give up
+     and propagate the exception. Client-level code will see that as
+     an I/O error.
   */
   const getSyncHandle = async (fh,opName)=>{
     if(!fh.syncHandle){
@@ -323,7 +324,7 @@ const installAsyncProxy = function(self){
           'in',performance.now() - t,'ms');
       if(!fh.xLock){
         __implicitLocks.add(fh.fid);
-        log("Auto-locked for",opName+"()",fh.fid,fh.filenameAbs);
+        log("Acquired implicit lock for",opName+"()",fh.fid,fh.filenameAbs);
       }
     }
     return fh.syncHandle;
diff --git a/ext/wasm/tests/opfs/concurrency/index.html b/ext/wasm/tests/opfs/concurrency/index.html
index d5aa51dc93..9a826c6e13 100644
--- a/ext/wasm/tests/opfs/concurrency/index.html
+++ b/ext/wasm/tests/opfs/concurrency/index.html
@@ -18,9 +18,7 @@
     <h1></h1>
     <p>
       OPFS concurrency tester using multiple independent Workers.
-      Disclaimer: concurrency in OPFS is currently a pain point
-      and timing/concurrency mitigation in this environment is
-      highly unpredictable!
+      Disclaimer: concurrency in OPFS is currently a pain point!
     </p>
     <p>
       URL flags: pass a number of workers using
diff --git a/manifest b/manifest
index e7c5ce5e81..ecfa59693e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C sqlite3.oo1.OpfsDb:\sdefault\sto\sjournal_mode=persist,\sas\scurrent\stests\sshow\sit\sto\sbe\smarginally\sfaster\sthan\struncate/delete\sin\sChrome\sv109.\sAlso\sincrease\sdefault\sbusy_timeout\sfrom\s2\sseconds\sto\s3,\sadmittedly\son\sa\swhim.
-D 2022-11-29T18:28:40.756
+C Doc\sand\slogging\stext\stweaks\sin\sthe\sOPFS\sasync\sproxy\sand\stest\sapp.
+D 2022-11-30T03:08:50.289
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -509,7 +509,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 2f99c9b2c3c0f53bf40153de20db350378deed825ec0d
 F ext/wasm/api/sqlite3-api-prologue.js 7fce4c6a138ec3d7c285b7c125cee809e6b668d2cb0d2328a1b790b7037765bd
 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 4b8973711ae4825bb047da932b9046b4e8f678fcea759158caebc5821a655ac7
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 315582a4fe3b87ceaff69ad4a67d68a350b8014ac94d6a584d09ea922453c983
 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
@@ -555,7 +555,7 @@ F ext/wasm/test-opfs-vfs.js 44363db07b2a20e73b0eb1808de4400ca71b703af718d0fa6d96
 F ext/wasm/tester1-worker.html 5ef353348c37cf2e4fd0b23da562d3275523e036260b510734e9a3239ba8c987
 F ext/wasm/tester1.c-pp.html 74aa9b31c75f12490653f814b53c3dd39f40cd3f70d6a53a716f4e8587107399
 F ext/wasm/tester1.c-pp.js a4b6a165aafcd3b86118efaec6b47c70fbb6c64b5ab86d21ca8c250d42617dfa
-F ext/wasm/tests/opfs/concurrency/index.html 2b1cda51d6c786102875a28eba22f0da3eecb732a5e677b0d1ecdb53546d1a62
+F ext/wasm/tests/opfs/concurrency/index.html 86d8ac435074d1e7007b91105f4897f368c165e8cecb6a9aa3d81f5cf5dcbe70
 F ext/wasm/tests/opfs/concurrency/test.js bfc3d7e27b207f0827f12568986b8d516a744529550b449314f5c21c9e9faf4a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
@@ -2064,8 +2064,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 cde95d382f8debcbca27c4aaf08470ffda35ab10d723a887786669367590ad3c
-R f012421262a97adb4d00809196a366a2
+P d0c8fa30a31c691bc1be5e98d806eeb1e23a8fc6cd54d87e5c1b720aa936e707
+R 05044488394ac3d7b358270198570ce0
 U stephan
-Z e12ff5fd260034aa46c1df81ecc7ab20
+Z cb806f606aa315e69c2e3fceeb852a45
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 43e23def0d..12e29fe3c0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0c8fa30a31c691bc1be5e98d806eeb1e23a8fc6cd54d87e5c1b720aa936e707
\ No newline at end of file
+7ce8608e221924d2c7067687eb6eef0f3cab181d5b4132e55a67d8514b6ce94b
\ No newline at end of file