From: drh <>
Date: Fri, 23 May 2025 14:52:23 +0000 (+0000)
Subject: Add the --osmalloc option to the test/speedtest.tcl testing script.
X-Git-Tag: major-release~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1ea1a6d4dc6d9ebb40fa7530962f75206557398;p=thirdparty%2Fsqlite.git

Add the --osmalloc option to the test/speedtest.tcl testing script.
Adjust ./configure so that it does not check for malloc_usable_size().

FossilOrigin-Name: 7e9845433ff26bdc5fe8654281d584394b77e3b206d09669b4468e0271c6eb37
---

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 1df6e233ff..85fe414382 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -616,7 +616,7 @@ proc sqlite-check-common-system-deps {} {
 
   # Check for needed/wanted functions
   cc-check-functions gmtime_r isnan localtime_r localtime_s \
-    malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64
+    strchrnul usleep utime pread pread64 pwrite pwrite64
 
   apply {{} {
     set ldrt ""
diff --git a/manifest b/manifest
index e55f159530..d6b70acb60 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\susing\sstreaming\siterators\swith\ssqlite3changegroup_add_change().
-D 2025-05-22T18:04:48.757
+C Add\sthe\s--osmalloc\soption\sto\sthe\stest/speedtest.tcl\stesting\sscript.\nAdjust\s./configure\sso\sthat\sit\sdoes\snot\scheck\sfor\smalloc_usable_size().
+D 2025-05-23T14:52:23.824
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -48,7 +48,7 @@ F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1
 F autosetup/jimsh0.c 563b966c137a4ce3c9333e5196723b7ac0919140a9d7989eb440463cd855c367
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl c4a77735b57f3c016a185bff048212a197b77723f9bea6cfafe396e4b542c666
-F autosetup/sqlite-config.tcl 7ff986f6c3951f3aec5608522cbf772d8d04a0d26cc894289e2ca4836e018719
+F autosetup/sqlite-config.tcl ccda82e43e377b832aae72a1678b1dc17dcaff36ed0ebbd8f0cfc88612ae8de3
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca
 F autosetup/teaish/core.tcl 1ebbe849d8e716424a3ffe9384c7e8b352b3e1194d3d4a153b125cc5176b3715
@@ -1686,7 +1686,7 @@ F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
 F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad
-F test/speedtest.tcl 926d1e168f4a14e6fb68c5dc174de743536b547f365264bd5bac533b3621a4a0 x
+F test/speedtest.tcl 01b1b08676bf5ad3ec6cb18f507576a47abc2d477ec1ef82888be45c88e36d12 x
 F test/speedtest1.c 64b8804b053a796eab22f8b23fb181000f05d7b3e2aa44f022117ea543bc5a2a
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
@@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ba8184d132a935aa1980fbfb61ff308b93d433d559db4968f9014f7653ac9c6e
-R 6545703450e23e51a4d8ba6cf71d201b
-U dan
-Z e2a99740785b40c0ced82e554792c0ed
+P 3dbde727146d28c316df47c7b5116be7f2476a0a0c893207c2a4ca3ab285cb5e
+R 0d48208b49d5cbef94b1e46b984a87ab
+U drh
+Z 2201e54bf2c0085b4630769c7de83fef
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1270cfae71..6b6c3f64f8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3dbde727146d28c316df47c7b5116be7f2476a0a0c893207c2a4ca3ab285cb5e
+7e9845433ff26bdc5fe8654281d584394b77e3b206d09669b4468e0271c6eb37
diff --git a/test/speedtest.tcl b/test/speedtest.tcl
index 1ad92d9ab0..473a30ec2a 100755
--- a/test/speedtest.tcl
+++ b/test/speedtest.tcl
@@ -25,6 +25,7 @@ Other options include:
    --help                Show this help screen.
    --lean                "Lean" mode.
    --lookaside N SZ      Lookahead uses N slots of SZ bytes each.
+   --osmalloc            Use the OS native malloc() instead of MEMSYS5
    --pagesize N          Use N as the page size.
    --quiet | -q          "Quite".  Put results in file but don't pop up editor
    --size N              Change the test size.  100 means 100%.  Default: 5.
@@ -40,7 +41,8 @@ set cc gcc
 set testset mix1
 set dryrun 0
 set quiet 0
-set speedtestflags {--shrink-memory --reprepare --stats --heap 40000000 64}
+set osmalloc 0
+set speedtestflags {--shrink-memory --reprepare --stats}
 lappend speedtestflags --journal wal --size 5
 
 for {set i 0} {$i<[llength $argv]} {incr i} {
@@ -92,6 +94,10 @@ for {set i 0} {$i<[llength $argv]} {incr i} {
       --dryrun {
         set dryrun 1
       }
+      -osmalloc -
+      --osmalloc {
+        set osmalloc 1
+      }
       -? -
       -help -
       --help {
@@ -139,10 +145,13 @@ for {set i 0} {$i<[llength $argv]} {incr i} {
 if {[lsearch -glob $cflags -O*]<0} {
   lappend cflags -Os
 }
-if {[lsearch -glob $cflags -DSQLITE_ENABLE_MEMSYS*]<0} {
+if {!$osmalloc} {
+  append cflags { --heap 40000000 64}
+}
+if {!$osmalloc && [lsearch -glob $cflags {-DSQLITE_ENABLE_MEMSYS*}]<0} {
   lappend cflags -DSQLITE_ENABLE_MEMSYS5
 }
-if {[lsearch -glob $cflags -DSQLITE_ENABLE_RTREE*]<0} {
+if {[lsearch -glob $cflags {-DSQLITE_ENABLE_RTREE*}]<0} {
   lappend cflags -DSQLITE_ENABLE_RTREE
 }
 if {$srcfile==""} {