From: dan <dan@noemail.net>
Date: Mon, 10 Dec 2018 16:52:31 +0000 (+0000)
Subject: Make SQLITE_MFS_NSHARD a compile time setting.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=107c5de8b2f976b08ed3b722c2136a25f4c35b2f;p=thirdparty%2Fsqlite.git

Make SQLITE_MFS_NSHARD a compile time setting.

FossilOrigin-Name: b9a741519055a8560ec1d0ab7d0c15ff8db53e740011825506cd2ede11c956f0
---

diff --git a/manifest b/manifest
index 16143f8169..2f7fef6936 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\stests\sto\sshmlock.test\s(direct\stesting\sof\sxShmLock\smethods).
-D 2018-12-10T15:51:05.281
+C Make\sSQLITE_MFS_NSHARD\sa\scompile\stime\ssetting.
+D 2018-12-10T16:52:31.796
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
@@ -491,7 +491,7 @@ F src/os.c 8aeb0b0f40f8f5b0da03fe49706695adaf42d2f516ab95abc72e86c245e119de
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c 4b21c5148ca49fa136a6f404121080deee3e14f14ce07ea3cd132e15d40e5a93
+F src/os_unix.c e191348d66fcbcf137cb2497de2c1e2ccca3caac0515a42c1a1d38043f519e9e
 F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 75e0f3cfa3962c714f519f8a3d1e67ecca1c91de0e010a036b988e40ce9e4c73
@@ -1783,7 +1783,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 d9157dd176a2d18c6e02a2a0c7e16cef2da43bf44be9765e0363f34aebad23e9
-R 24f7a75900edcf030e0982b0e1c98eeb
+P d2c785f94cc6b704ce29147399e2c473fd0f4ff377f1379bd29178bf6d127c1a
+R 405c2e0a847d1dc9742f041e349c6a79
 U dan
-Z d8fb14bd354e885b5baff90283e91e8d
+Z 0d67b443d35d0a267898c50a3a55aea3
diff --git a/manifest.uuid b/manifest.uuid
index abbf850327..890ad2c80f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d2c785f94cc6b704ce29147399e2c473fd0f4ff377f1379bd29178bf6d127c1a
\ No newline at end of file
+b9a741519055a8560ec1d0ab7d0c15ff8db53e740011825506cd2ede11c956f0
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 7c31d72511..435e4cad08 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -48,8 +48,13 @@
 
 /* Turn this feature on in all builds for now */
 #define SQLITE_MUTEXFREE_SHMLOCK 1
-#define SQLITE_MFS_NSHARD        5
 #define SQLITE_MFS_EXCLUSIVE     255
+#ifndef SQLITE_MFS_NSHARD
+# define SQLITE_MFS_NSHARD       8
+#endif
+#if SQLITE_MFS_NSHARD<1
+# error "SQLITE_MFS_NSHARD must be greater than 0"
+#endif
 
 /*
 ** There are various methods for file locking used for concurrency