From 429899ddad8acac2346874184d263f438ac9b4b6 Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 30 Aug 2022 09:51:24 +0000 Subject: [PATCH] Remove the .timer script entry from fiddle app because emscripten has removed getrusage(), which breaks the timer. FossilOrigin-Name: 9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01 --- ext/wasm/fiddle/fiddle.js | 3 ++- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ext/wasm/fiddle/fiddle.js b/ext/wasm/fiddle/fiddle.js index 3fd36bff86..ec56dd5930 100644 --- a/ext/wasm/fiddle/fiddle.js +++ b/ext/wasm/fiddle/fiddle.js @@ -730,7 +730,8 @@ -- only that part is executed. -- ================================================ .help`}, - {name: "Timer on", sql: ".timer on"}, + //{name: "Timer on", sql: ".timer on"}, + // ^^^ re-enable if emscripten re-enables getrusage() {name: "Setup table T", sql:`.nullvalue NULL CREATE TABLE t(a,b); INSERT INTO t(a,b) VALUES('abc',123),('def',456),(NULL,789),('ghi',012); diff --git a/manifest b/manifest index 11a40f3737..97a8f12651 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C wasm\sutil:\sremove\ssuperfluous\sfunction.bind()\scalls\sto\seliminate\sa\slevel\sof\scall()\sindirection. -D 2022-08-30T09:49:30.007 +C Remove\sthe\s.timer\sscript\sentry\sfrom\sfiddle\sapp\sbecause\semscripten\shas\sremoved\sgetrusage(),\swhich\sbreaks\sthe\stimer. +D 2022-08-30T09:51:24.863 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -500,7 +500,7 @@ F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f 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/fiddle/fiddle.js 4ffcfc9a235beebaddec689a549e9e0dfad6dca5c1f0b41f03468d7e76480686 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f @@ -2012,8 +2012,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 24b82b9504db3d8e1335c2300b133f897dc1a541026dc24be5b0ffd8be66d977 -R c9f285330e60c2a709dc88c6f308d17d +P 1aab9627983ef0f016b01f78564e79cf815ed14d4b1b6dc04ec627b96f1b2f70 +R 7a91cd8f075d71f1129b2c16dc0c7e0d U stephan -Z 746ec57f2eb86d7d664aa6615f7c7bf3 +Z fa99287ead67c43b637178f52d6fe01b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index fe3f5cacb1..ef13e59932 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1aab9627983ef0f016b01f78564e79cf815ed14d4b1b6dc04ec627b96f1b2f70 \ No newline at end of file +9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01 \ No newline at end of file -- 2.47.2