Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix an assert() in lsm_shared.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
90c09b04513a40871a97d7aa4a7221af |
| User & Date: | dan 2014-09-19 18:48:23 |
Context
|
2015-08-15
| ||
| 18:03 | Fix typo in comments. No code changes. check-in: 7df97b5937 user: drh tags: trunk | |
|
2014-09-19
| ||
| 18:48 | Fix an assert() in lsm_shared.c. check-in: 90c09b0451 user: dan tags: trunk | |
|
2014-05-12
| ||
| 21:07 | Added -lm to the build flags for Makefile.gcc-linux, based on ML feedback. check-in: 26964761e2 user: stephan tags: trunk | |
Changes
Changes to src/lsm_shared.c.
1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 |
){
lsm_db *pIter;
const u64 me = ((u64)1 << (iLock-1));
const u64 ms = ((u64)1 << (iLock+32-1));
int rc = LSM_OK;
Database *p = db->pDatabase;
assert( eOp!=LSM_LOCK_EXCL || db->bReadonly==0 );
assert( iLock>=1 && iLock<=LSM_LOCK_RWCLIENT(LSM_LOCK_NRWCLIENT-1) );
assert( LSM_LOCK_RWCLIENT(LSM_LOCK_NRWCLIENT-1)<=32 );
assert( eOp==LSM_LOCK_UNLOCK || eOp==LSM_LOCK_SHARED || eOp==LSM_LOCK_EXCL );
/* Check for a no-op. Proceed only if this is not one of those. */
if( (eOp==LSM_LOCK_UNLOCK && (db->mLock & (me|ms))!=0)
|| (eOp==LSM_LOCK_SHARED && (db->mLock & (me|ms))!=ms)
|
| |
1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 |
){
lsm_db *pIter;
const u64 me = ((u64)1 << (iLock-1));
const u64 ms = ((u64)1 << (iLock+32-1));
int rc = LSM_OK;
Database *p = db->pDatabase;
assert( eOp!=LSM_LOCK_EXCL || p->bReadonly==0 );
assert( iLock>=1 && iLock<=LSM_LOCK_RWCLIENT(LSM_LOCK_NRWCLIENT-1) );
assert( LSM_LOCK_RWCLIENT(LSM_LOCK_NRWCLIENT-1)<=32 );
assert( eOp==LSM_LOCK_UNLOCK || eOp==LSM_LOCK_SHARED || eOp==LSM_LOCK_EXCL );
/* Check for a no-op. Proceed only if this is not one of those. */
if( (eOp==LSM_LOCK_UNLOCK && (db->mLock & (me|ms))!=0)
|| (eOp==LSM_LOCK_SHARED && (db->mLock & (me|ms))!=ms)
|