/ Check-in [028ed861]
Login

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

Overview
Comment:Fix an assert() in os_unix.c that is not true when using RBU.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:028ed8618af012b51104a06cc155b45d98bc4ff833d4431b9c38fd6851a74e82
User & Date: dan 2018-09-12 20:32:19
Context
2018-09-13
13:17
Fix a requirement mark on a test script. No changes to code. check-in: 628d5c0a user: drh tags: trunk
2018-09-12
20:32
Fix an assert() in os_unix.c that is not true when using RBU. check-in: 028ed861 user: dan tags: trunk
15:51
Restrict the scope of internal-use functions in alter.c. check-in: 4396914f user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

4875
4876
4877
4878
4879
4880
4881

4882

4883
4884
4885
4886
4887
4888
4889
** any load or store begun after the barrier.
*/
static void unixShmBarrier(
  sqlite3_file *fd                /* Database file holding the shared memory */
){
  UNUSED_PARAMETER(fd);
  sqlite3MemoryBarrier();         /* compiler-defined memory barrier */

  assert( unixFileMutexNotheld((unixFile*)fd) );

  unixEnterMutex();               /* Also mutex, for redundancy */
  unixLeaveMutex();
}

/*
** Close a connection to shared-memory.  Delete the underlying 
** storage if deleteFlag is true.







>
|
>







4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
** any load or store begun after the barrier.
*/
static void unixShmBarrier(
  sqlite3_file *fd                /* Database file holding the shared memory */
){
  UNUSED_PARAMETER(fd);
  sqlite3MemoryBarrier();         /* compiler-defined memory barrier */
  assert( fd->pMethods->xLock==nolockLock 
       || unixFileMutexNotheld((unixFile*)fd) 
  );
  unixEnterMutex();               /* Also mutex, for redundancy */
  unixLeaveMutex();
}

/*
** Close a connection to shared-memory.  Delete the underlying 
** storage if deleteFlag is true.