From: drh <drh@noemail.net>
Date: Tue, 28 Apr 2020 11:45:41 +0000 (+0000)
Subject: Use an AtomicLoad() macro in sqlite3HeapNearlyFull().
X-Git-Tag: version-3.32.0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f603fcefdaa30dd4cd4ce5b9dd83a8abb865acd;p=thirdparty%2Fsqlite.git

Use an AtomicLoad() macro in sqlite3HeapNearlyFull().

FossilOrigin-Name: 7556bc632e271d8a1e4fd836ce91e28213768ac09c90857b91171e9cd1009884
---

diff --git a/manifest b/manifest
index e6fae833bc..b657255abb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Yet\sanother\sattempt\sto\senhance\ssqlite3_load_extension()\sso\sthat\sit\sworks\nwith\sWindow-style\spathnames\susing\sa\sbackslash\sseparator\scharacter.
-D 2020-04-26T22:04:48.458
+C Use\san\sAtomicLoad()\smacro\sin\ssqlite3HeapNearlyFull().
+D 2020-04-28T11:45:41.489
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -497,7 +497,7 @@ F src/insert.c 8e4211d04eb460c0694d486c6ba1c068d468c6f653c3f237869a802ad82854de
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 421310045bd78afefb772294a99e50f37d87ae578786a6169074e6291e30d969
 F src/main.c 652a782cd7b6c6ddf7419fcaf06b8aa9440b7c815857241171c9bdf03ab6544c
-F src/malloc.c cabfef0d725e04c8abfe0231a556ed8b78bf329dcc3fddbf903f6cdcd53cf4e6
+F src/malloc.c 998984783063d4172bb11630ba586e6c6483ddfc8e24a9881a6f495128f23569
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@ -1861,7 +1861,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 57b16d8ca3d1ede3b411389256bec6686433aae716f47bca309ee7c8e5fe3128
-R cae58a18aebbf7b95fb40ba841d77f19
+P b73d9a7d6f7fec0ffc9640902a849289c305f8651e891388c01255c4da7a6c4b
+R 375d527c1770329817dc7ce201edba48
 U drh
-Z a013006b51e7e5f259533e9a3800742b
+Z 59f2a3e0f3e029b2d7560f165c376f3c
diff --git a/manifest.uuid b/manifest.uuid
index b3a75f3c82..6ec6c7587e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b73d9a7d6f7fec0ffc9640902a849289c305f8651e891388c01255c4da7a6c4b
\ No newline at end of file
+7556bc632e271d8a1e4fd836ce91e28213768ac09c90857b91171e9cd1009884
\ No newline at end of file
diff --git a/src/malloc.c b/src/malloc.c
index a19d8bdfb3..6d149f3f98 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -179,7 +179,7 @@ int sqlite3MallocInit(void){
 ** sqlite3_soft_heap_limit().
 */
 int sqlite3HeapNearlyFull(void){
-  return mem0.nearlyFull;
+  return AtomicLoad(&mem0.nearlyFull);
 }
 
 /*