From: stephan <stephan@noemail.net>
Date: Sat, 13 Aug 2022 13:51:56 +0000 (+0000)
Subject: Remove OPFS from the fiddle build for the time being - will re-enable once the breaka... 
X-Git-Tag: version-3.40.0~169^2~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90218aec7a0991199b3e06faf723dd482bf970f6;p=thirdparty%2Fsqlite.git

Remove OPFS from the fiddle build for the time being - will re-enable once the breakage is figured out via testing with the core API.

FossilOrigin-Name: 3bc510a614973eafa60960a99bedb063594a693bdbfd80d7eb480b293b4ab811
---

diff --git a/Makefile.in b/Makefile.in
index 00ea77f045..c9de1403f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1542,12 +1542,21 @@ $(sqlite3_wasm_c): sqlite3.c
 #emcc_opt = -O2
 #emcc_opt = -O3
 emcc_opt = -Oz
-emcc_flags_opfs = -sWASMFS -pthread '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
+emcc_environment = web
+# WASMFS OPFS is currently completely broken under fiddle but the
+# root cause has not yet been determined.
+emcc_flags_opfs =
+#emcc_flags_opfs += -sWASMFS -pthread
+#emcc_environment = web,worker
+#emcc_flags_opfs += -DSQLITE_WASM_OPFS
+#emcc_flags_opfs += '-DSQLITE_DEFAULT_UNIX_VFS="unix-none"'
+#emcc_flags_opfs += -sPTHREAD_POOL_SIZE=2
+#emcc_flags_opfs += -sPTHREAD_POOL_SIZE_STRICT=2
 emcc_flags = $(emcc_opt) \
         -sALLOW_TABLE_GROWTH \
         -sABORTING_MALLOC \
         -sSTRICT_JS \
-        -sENVIRONMENT=web,worker \
+        -sENVIRONMENT=$(emcc_environment) \
         -sMODULARIZE \
         -sEXPORTED_RUNTIME_METHODS=@$(wasm_dir_abs)/EXPORTED_RUNTIME_METHODS.fiddle \
         -sDYNAMIC_EXECUTION=0 \
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index fb9fd30229..5bc1391753 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -296,23 +296,7 @@
      emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initFiddleModule
   */
   initFiddleModule(fiddleModule).then(function(thisModule){
-    fiddleModule.fsUnlink = fiddleModule.cwrap('sqlite3_wasm_vfs_unlink','number',['string']);
-    (function initOpfs(){
-      if(!self.FileSystemHandle || !self.FileSystemDirectoryHandle
-         || !self.FileSystemFileHandle){
-        stdout("OPFS unavailable. All DB state is transient.");
-        return;
-      }
-      try {
-        if(0===fiddleModule.ccall('sqlite3_wasm_init_opfs', undefined)){
-          stdout("Initialized OPFS WASMFS backend.");
-        }else{
-          stderr("Initialization of OPFS WASMFS backend failed.");
-        }
-      }catch(e){
-        stderr("Apparently missing WASMFS:",e.message);
-      }
-    })();
+    thisModule.fsUnlink = thisModule.cwrap('sqlite3_wasm_vfs_unlink','number',['string']);
     wMsg('fiddle-ready');
   });
 })();
diff --git a/manifest b/manifest
index e90ec6ca06..73a423621e 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C wasm\sOO\sAPI\s#1:\sadded\sDB.callInTransaction()\sand\sStmt.stepFinalize().
-D 2022-08-13T13:46:19.722
+C Remove\sOPFS\sfrom\sthe\sfiddle\sbuild\sfor\sthe\stime\sbeing\s-\swill\sre-enable\sonce\sthe\sbreakage\sis\sfigured\sout\svia\stesting\swith\sthe\score\sAPI.
+D 2022-08-13T13:51:56.967
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 5d0dfceebf19ccbce323181fa14fe15c3bc470293420a6b680fc76a1b1779087
+F Makefile.in 419791c8e6f5fda6bf33977680e8f3bf782f5f6ec56b5c22567912c7f8fef353
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -495,7 +495,7 @@ F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
 F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js c9d66230269cc26d33aa84501ae601c24f8697c3711be5d769c4c687bfcaba8f
+F ext/wasm/fiddle/fiddle-worker.js bccf46045be8824752876f3eec01c223be0616ccac184bffd0024cfe7a3262b8
 F ext/wasm/fiddle/fiddle.html 550c5aafce40bd218de9bf26192749f69f9b10bc379423ecd2e162bcef885c08
 F ext/wasm/fiddle/fiddle.js bef4b30e078445a7cd2255fba07acd083aa1c3cc074a73b38ea847fd340f1adc
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
@@ -1999,8 +1999,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 d4d773405c579e7efd95be8d81fe14d71218e62e44c523d38e02f89424ba6ce8
-R d6004d575cfc0551ba9a0fec437e8b0f
+P e37dddc1dd9c0530e4b1c6cb0ca7cba7451caa37734d383c9b47f378d7222242
+R 988d3478699d43ef2ce9b5c2bc8119e6
 U stephan
-Z 111c1d0636763c3347de9dc9f9b9e9af
+Z c96da5568e2699a3b63963443a07c191
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d1493580ab..f61125d960 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e37dddc1dd9c0530e4b1c6cb0ca7cba7451caa37734d383c9b47f378d7222242
\ No newline at end of file
+3bc510a614973eafa60960a99bedb063594a693bdbfd80d7eb480b293b4ab811
\ No newline at end of file