Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix bug in recycling of shared memory space. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | rework-flow-control |
| Files: | files | file ages | folders |
| SHA1: |
156b93d03bd06fd984f8fd30b523046f |
| User & Date: | dan 2012-09-25 19:13:37 |
Context
|
2012-09-26
| ||
| 11:57 | Fix a problem in free-list management. check-in: 57444405e3 user: dan tags: rework-flow-control | |
|
2012-09-25
| ||
| 19:13 | Fix bug in recycling of shared memory space. check-in: 156b93d03b user: dan tags: rework-flow-control | |
| 18:27 | Fix a problem causing read-locks to fail with LSM_BUSY. check-in: 7eee90a0aa user: dan tags: rework-flow-control | |
Changes
Changes to src/lsmInt.h.
759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 |
int lsmBeginFlush(lsm_db *);
int lsmBeginWork(lsm_db *);
void lsmFinishWork(lsm_db *, int, int, int *);
int lsmFinishRecovery(lsm_db *);
void lsmFinishReadTrans(lsm_db *);
int lsmFinishWriteTrans(lsm_db *, int, int);
int lsmFinishFlush(lsm_db *, int);
int lsmSnapshotSetFreelist(lsm_db *, int *, int);
Snapshot *lsmDbSnapshotClient(lsm_db *);
Snapshot *lsmDbSnapshotWorker(lsm_db *);
|
| |
759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 |
int lsmBeginFlush(lsm_db *); int lsmBeginWork(lsm_db *); void lsmFinishWork(lsm_db *, int, int, int *); int lsmFinishRecovery(lsm_db *); void lsmFinishReadTrans(lsm_db *); int lsmFinishWriteTrans(lsm_db *, int); int lsmFinishFlush(lsm_db *, int); int lsmSnapshotSetFreelist(lsm_db *, int *, int); Snapshot *lsmDbSnapshotClient(lsm_db *); Snapshot *lsmDbSnapshotWorker(lsm_db *); |
Changes to src/lsm_main.c.
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
...
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
|
int bAutowork = 0;
/* Commit the transaction to disk. */
if( rc==LSM_OK ) rc = lsmLogCommit(pDb);
if( rc==LSM_OK && pDb->eSafety==LSM_SAFETY_FULL ){
rc = lsmFsSyncLog(pDb->pFS);
}
if( rc==LSM_OK && lsmTreeSize(pDb)>pDb->nTreeLimit ){
lsmTreeMakeOld(pDb);
bAutowork = pDb->bAutowork;
}
lsmFinishWriteTrans(pDb, (rc==LSM_OK), bAutowork);
}
pDb->nTransOpen = iLevel;
}
dbReleaseClientSnapshot(pDb);
return rc;
}
................................................................................
TransMark *pMark = &pDb->aTrans[(iLevel==0 ? 0 : iLevel-1)];
lsmTreeRollback(pDb, &pMark->tree);
if( iLevel ) lsmLogSeek(pDb, &pMark->log);
pDb->nTransOpen = iLevel;
}
if( pDb->nTransOpen==0 ){
lsmFinishWriteTrans(pDb, 0, 0);
}
dbReleaseClientSnapshot(pDb);
}
return rc;
}
|
<
<
<
<
|
|
|
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
...
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
|
int bAutowork = 0;
/* Commit the transaction to disk. */
if( rc==LSM_OK ) rc = lsmLogCommit(pDb);
if( rc==LSM_OK && pDb->eSafety==LSM_SAFETY_FULL ){
rc = lsmFsSyncLog(pDb->pFS);
}
lsmFinishWriteTrans(pDb, (rc==LSM_OK));
}
pDb->nTransOpen = iLevel;
}
dbReleaseClientSnapshot(pDb);
return rc;
}
................................................................................
TransMark *pMark = &pDb->aTrans[(iLevel==0 ? 0 : iLevel-1)];
lsmTreeRollback(pDb, &pMark->tree);
if( iLevel ) lsmLogSeek(pDb, &pMark->log);
pDb->nTransOpen = iLevel;
}
if( pDb->nTransOpen==0 ){
lsmFinishWriteTrans(pDb, 0);
}
dbReleaseClientSnapshot(pDb);
}
return rc;
}
|
Changes to src/lsm_shared.c.
808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 |
** written into the log file when this function is called. Or, if the ** transaction was rolled back, both the log file and in-memory tree ** structure have already been restored. In either case, this function ** merely releases locks and other resources held by the write-transaction. ** ** LSM_OK is returned if successful, or an LSM error code otherwise. */ int lsmFinishWriteTrans(lsm_db *pDb, int bCommit, int nAutowork){ int rc = LSM_OK; lsmLogEnd(pDb, bCommit); lsmTreeEndTransaction(pDb, bCommit); if( nAutowork ){ rc = lsmSortedAutoWork(pDb, nAutowork); } lsmShmLock(pDb, LSM_LOCK_WRITER, LSM_LOCK_UNLOCK, 0); return rc; } /* |
| > > | | > |
808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 |
** written into the log file when this function is called. Or, if the
** transaction was rolled back, both the log file and in-memory tree
** structure have already been restored. In either case, this function
** merely releases locks and other resources held by the write-transaction.
**
** LSM_OK is returned if successful, or an LSM error code otherwise.
*/
int lsmFinishWriteTrans(lsm_db *pDb, int bCommit){
int rc = LSM_OK;
lsmLogEnd(pDb, bCommit);
lsmTreeEndTransaction(pDb, bCommit);
if( rc==LSM_OK && bCommit && lsmTreeSize(pDb)>pDb->nTreeLimit ){
lsmTreeMakeOld(pDb);
if( pDb->bAutowork ){
rc = lsmSortedAutoWork(pDb, 1);
}
}
lsmShmLock(pDb, LSM_LOCK_WRITER, LSM_LOCK_UNLOCK, 0);
return rc;
}
/*
|