Fossil

Diff
Login

Differences From Artifact [2b79697f16]:

To Artifact [df7150d9b4]:


41284
41285
41286
41287
41288
41289
41290
41291

41292
41293
41294
41295
41296
41297
41298
41284
41285
41286
41287
41288
41289
41290

41291
41292
41293
41294
41295
41296
41297
41298







-
+







** a single exclusive lock.  In other words, SHARED, RESERVED, and
** PENDING locks are the same thing as an EXCLUSIVE lock.  SQLite
** still works when you do this, but concurrency is reduced since
** only a single process can be reading the database at a time.
**
** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off
*/
#if SQLITE_ENABLE_LOCKING_STYLE
#if SQLITE_ENABLE_LOCKING_STYLE || defined(__ixemul__)

/*
** Retry flock() calls that fail with EINTR
*/
#ifdef EINTR
static int robust_flock(int fd, int op){
  int rc;
44436
44437
44438
44439
44440
44441
44442
44443

44444
44445
44446
44447
44448
44449
44450
44436
44437
44438
44439
44440
44441
44442

44443
44444
44445
44446
44447
44448
44449
44450







-
+







  dotlockClose,             /* xClose method */
  dotlockLock,              /* xLock method */
  dotlockUnlock,            /* xUnlock method */
  dotlockCheckReservedLock, /* xCheckReservedLock method */
  0                         /* xShmMap method */
)

#if SQLITE_ENABLE_LOCKING_STYLE
#if SQLITE_ENABLE_LOCKING_STYLE || defined(__ixemul__)
IOMETHODS(
  flockIoFinder,            /* Finder function name */
  flockIoMethods,           /* sqlite3_io_methods object name */
  1,                        /* shared memory is disabled */
  flockClose,               /* xClose method */
  flockLock,                /* xLock method */
  flockUnlock,              /* xUnlock method */
47040
47041
47042
47043
47044
47045
47046




47047
47048
47049
47050
47051
47052
47053
47040
47041
47042
47043
47044
47045
47046
47047
47048
47049
47050
47051
47052
47053
47054
47055
47056
47057







+
+
+
+







  ** array cannot be const.
  */
  static sqlite3_vfs aVfs[] = {
#if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__)
    UNIXVFS("unix",          autolockIoFinder ),
#elif OS_VXWORKS
    UNIXVFS("unix",          vxworksIoFinder ),
#elif defined(__ixemul__)
    UNIXVFS("unix",          flockIoFinder ),
    UNIXVFS("unix-flock",    flockIoFinder ),
    UNIXVFS("unix-posix",    flockIoFinder ),
#else
    UNIXVFS("unix",          posixIoFinder ),
#endif
    UNIXVFS("unix-none",     nolockIoFinder ),
    UNIXVFS("unix-dotfile",  dotlockIoFinder ),
    UNIXVFS("unix-excl",     posixIoFinder ),
#if OS_VXWORKS