database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Fix an assert() in os_unix.c that is not true when using RBU.

Browse Source 
FossilOrigin-Name: 028ed8618af012b51104a06cc155b45d98bc4ff833d4431b9c38fd6851a74e82
This commit is contained in:
dan
2018-09-12 20:32:19 +00:00
parent 16b870d804
commit a86acc2132
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Restrict\sthe\sscope\sof\sinternal-use\sfunctions\sin\salter.c. C Fix\san\sassert()\sin\sos_unix.c\sthat\sis\snot\strue\swhen\susing\sRBU.
D 2018-09-12T15:51:56.382 D 2018-09-12T20:32:19.959
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995 F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
@@ -485,7 +485,7 @@ F src/os.c 8aeb0b0f40f8f5b0da03fe49706695adaf42d2f516ab95abc72e86c245e119de
F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
F src/os_unix.c 03a5cd0e254dfecd86e800e442a35636c755ececb9e33863a978d9ab23120938 F src/os_unix.c d8e37bc3af9b15a52c3fecd366c95416251aa8d89481dd56170bad538b421721
F src/os_win.c 070cdbb400097c6cda54aa005356095afdc2f3ee691d17192c54724ef146a971 F src/os_win.c 070cdbb400097c6cda54aa005356095afdc2f3ee691d17192c54724ef146a971
F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
F src/pager.c a0d8f686ef64549ad5b356fd30429bd9ee7a06dd42b4d6faa096352ff26b1c5b F src/pager.c a0d8f686ef64549ad5b356fd30429bd9ee7a06dd42b4d6faa096352ff26b1c5b
@@ -1765,7 +1765,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 27837624336d2883f721310bd4dceedb77085d1008af5e12557f634936d48b8c P 4396914f8e1a847d86c22fb0b91e7431cf19aa260cbec520af3564248d6897ad
R 8c74c0be917d870f4ce6d5afdcc4480b R 04270aabbf5aa7a25158dc0e14607b5c
U drh U dan
Z f845bcddfc6ed1eb1eebbad288573085 Z 006b0a748ebdda21ed6dd1a66ca8163c

2
manifest.uuid
View File

@@ -1 +1 @@
4396914f8e1a847d86c22fb0b91e7431cf19aa260cbec520af3564248d6897ad 028ed8618af012b51104a06cc155b45d98bc4ff833d4431b9c38fd6851a74e82

4
src/os_unix.c
View File

@@ -4879,7 +4879,9 @@ static void unixShmBarrier(
){ ){
UNUSED_PARAMETER(fd); UNUSED_PARAMETER(fd);
sqlite3MemoryBarrier(); /* compiler-defined memory barrier */ sqlite3MemoryBarrier(); /* compiler-defined memory barrier */
assert( unixFileMutexNotheld((unixFile*)fd) ); assert( fd->pMethods->xLock==nolockLock
|| unixFileMutexNotheld((unixFile*)fd)
);
unixEnterMutex(); /* Also mutex, for redundancy */ unixEnterMutex(); /* Also mutex, for redundancy */
unixLeaveMutex(); unixLeaveMutex();
} }