/ Check-in [186b376e]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge latest mutexfree-shmlock changes into this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | begin-concurrent-pnu-mutexfree-shmlock
Files: files | file ages | folders
SHA3-256: 186b376ec3713f9c8a1499a9675b3c1b42ef3a123848506a48d3a196ba6461f3
User & Date: dan 2018-12-10 16:53:32
Context
2018-12-10
16:53
Merge latest mutexfree-shmlock changes into this branch. Leaf check-in: 186b376e user: dan tags: begin-concurrent-pnu-mutexfree-shmlock
16:52
Make SQLITE_MFS_NSHARD a compile time setting. check-in: b9a74151 user: dan tags: mutexfree-shmlock
15:58
Merge the latest version of mutexfree-shmlock with this branch. check-in: 6007abfe user: dan tags: begin-concurrent-pnu-mutexfree-shmlock
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

    44     44   **      plus implementations of sqlite3_os_init() and sqlite3_os_end().
    45     45   */
    46     46   #include "sqliteInt.h"
    47     47   #if SQLITE_OS_UNIX              /* This file is used on unix only */
    48     48   
    49     49   /* Turn this feature on in all builds for now */
    50     50   #define SQLITE_MUTEXFREE_SHMLOCK 1
    51         -#define SQLITE_MFS_NSHARD        5
    52     51   #define SQLITE_MFS_EXCLUSIVE     255
           52  +#ifndef SQLITE_MFS_NSHARD
           53  +# define SQLITE_MFS_NSHARD       8
           54  +#endif
           55  +#if SQLITE_MFS_NSHARD<1
           56  +# error "SQLITE_MFS_NSHARD must be greater than 0"
           57  +#endif
    53     58   
    54     59   /*
    55     60   ** There are various methods for file locking used for concurrency
    56     61   ** control:
    57     62   **
    58     63   **   1. POSIX locking (the default),
    59     64   **   2. No locking,