Roll back part of [c54f29d8] which attempted to use symbols which that worker does...

FossilOrigin-Name: 90b12211376eb445df7221b3d3593394ff651ef93f4218492c6208bc74b8fc63

diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js
index b1ad9152e7b36cfb4a5fd81e7f51ec2d9dbac378..1456ae08d2f5231e89e926d2b02d6bc98a090fe6 100644 (file)
--- a/ext/wasm/api/sqlite3-opfs-async-proxy.js
+++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js
@@ -74,9 +74,9 @@ const installAsyncProxy = function(self){
   state.verbose = 1;
 
   const loggers = {
-    0:sqlite3.config.error.bind(console),
-    1:sqlite3.config.warn.bind(console),
-    2:sqlite3.config.log.bind(console)
+    0:console.error.bind(console),
+    1:console.warn.bind(console),
+    2:console.log.bind(console)
   };
   const logImpl = (level,...args)=>{
     if(state.verbose>level) loggers[level]("OPFS asyncer:",...args);
@@ -106,12 +106,12 @@ const installAsyncProxy = function(self){
       w += m.wait;
       m.avgTime = (m.count && m.time) ? (m.time / m.count) : 0;
     }
-    sqlite3.config.log(self.location.href,
+    console.log(self.location.href,
                 "metrics for",self.location.href,":\n",
                 metrics,
                 "\nTotal of",n,"op(s) for",t,"ms",
                 "approx",w,"ms spent waiting on OPFS APIs.");
-    sqlite3.config.log("Serialization metrics:",metrics.s11n);
+    console.log("Serialization metrics:",metrics.s11n);
   };
 
   /**
@@ -272,7 +272,7 @@ const installAsyncProxy = function(self){
               || (e.cause.name==='DOMException'
                   && 0===e.cause.message.indexOf('Access Handles cannot')))
       ) ? (
-        /*sqlite3.config.warn("SQLITE_BUSY",e),*/
+        /*console.warn("SQLITE_BUSY",e),*/
         state.sq3Codes.SQLITE_BUSY
       ) : rc;
     }else{

diff --git a/manifest b/manifest
index 01139f0fbce20357fbc3e13e735532b0db1bfd59..eb2ec3c06ef18b3dab1495d808f3eade186f0f70 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sRBU\stest\sscripts\sto\savoid\sattempting\sto\scopy\sor\sdelete\sa\slocked\sfile.
-D 2023-02-06T19:00:54.237
+C Roll\sback\spart\sof\s[c54f29d8]\swhich\sattempted\sto\suse\ssymbols\swhich\sthat\sworker\sdoes\snot\shave\saccess\sto.
+D 2023-02-06T21:20:59.248
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/wasm/api/sqlite3-api-oo1.js 9b50c188513c70438a497914089cfeac79b6ac2d735017
 F ext/wasm/api/sqlite3-api-prologue.js 5cc817b67a774bfa3c47d4c2fa484b10b24b5529a66094b35546f3ebba1ef646
 F ext/wasm/api/sqlite3-api-worker1.js 9551f04cdfcde354e5a6ccb48951e007d618abb4e95758297b7fd44ccffdf89f
 F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
-F ext/wasm/api/sqlite3-opfs-async-proxy.js 2bc6b2b68198467ff467cea9657df7a9b06dcd50adb78efc8c7d893394eb3010
+F ext/wasm/api/sqlite3-opfs-async-proxy.js 7795b84b66a7a8dedc791340709b310bb497c3c72a80bef364fa2a58e2ddae3f
 F ext/wasm/api/sqlite3-v-helper.js 6f6c3e390a72e08b0a5b16a0d567d7af3c04d172831853a29d72a6f1dd40ff24
 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js ca291837840b3eae3a60810721a7970c98f7c7cd3ee1c879acb7e91f1e3fe65a
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
@@ -2045,8 +2045,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 5dde07a91dcf99b9c9a418b4e2178f66eef4cffd4799538a419674314a7530f9
-R 249137c726d5884204a2faf3e938a076
-U dan
-Z fb37ea41986419483c8b019665bddd2c
+P f25eb898fce44120136f8ee5557305f43541e8a75323cfc3becf103f3fa795aa
+R 45dc2b723628d86b418bb80a3f156c5c
+U stephan
+Z 38ec374e47328d1caa5423d767743727
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 804cc3ebc43f31f0f0be21d5a0060efaf6c65e1e..496c3c7b005f668b56784dbcab4ba254cbc18ea9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f25eb898fce44120136f8ee5557305f43541e8a75323cfc3becf103f3fa795aa
\ No newline at end of file
+90b12211376eb445df7221b3d3593394ff651ef93f4218492c6208bc74b8fc63
\ No newline at end of file