diff options
| author | Brian S. O'Neill <bronee@gmail.com> | 2007-10-15 00:08:57 +0000 |
|---|---|---|
| committer | Brian S. O'Neill <bronee@gmail.com> | 2007-10-15 00:08:57 +0000 |
| commit | 7fc50f10c33d29772d57d8c0af354eeb4eccf3ee (patch) | |
| tree | 139f3cef2834c63acecf8504121f25b061cea987 /src/main/java/com/amazon/carbonado | |
| parent | 42aa78c4b24093d8233a2f2afe89613019d9caf9 (diff) | |
Minor lock fixes and optimizations.
Diffstat (limited to 'src/main/java/com/amazon/carbonado')
| -rw-r--r-- | src/main/java/com/amazon/carbonado/spi/TransactionManager.java | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/src/main/java/com/amazon/carbonado/spi/TransactionManager.java b/src/main/java/com/amazon/carbonado/spi/TransactionManager.java index e8cc637..355af7c 100644 --- a/src/main/java/com/amazon/carbonado/spi/TransactionManager.java +++ b/src/main/java/com/amazon/carbonado/spi/TransactionManager.java @@ -451,12 +451,18 @@ public abstract class TransactionManager<Txn> { }
public void setDesiredLockTimeout(int timeout, TimeUnit unit) {
- if (timeout < 0) {
- mDesiredLockTimeout = 0;
- mTimeoutUnit = null;
- } else {
- mDesiredLockTimeout = timeout;
- mTimeoutUnit = unit;
+ TransactionManager<Txn> txnMgr = mTxnMgr;
+ txnMgr.mLock.lock();
+ try {
+ if (timeout < 0) {
+ mDesiredLockTimeout = 0;
+ mTimeoutUnit = null;
+ } else {
+ mDesiredLockTimeout = timeout;
+ mTimeoutUnit = unit;
+ }
+ } finally {
+ txnMgr.mLock.unlock();
}
}
@@ -464,6 +470,7 @@ public abstract class TransactionManager<Txn> { return mLevel;
}
+ // Caller must hold mLock.
<S extends Storable> void register(Cursor<S> cursor) {
if (mCursorList == null) {
mCursorList = new CursorList<Object>();
@@ -471,30 +478,28 @@ public abstract class TransactionManager<Txn> { mCursorList.register(cursor, null);
}
+ // Caller must hold mLock.
<S extends Storable> void unregister(Cursor<S> cursor) {
if (mCursorList != null) {
mCursorList.unregister(cursor);
}
}
+ // Caller must hold mLock.
Txn getTxn() throws Exception {
- TransactionManager<Txn> txnMgr = mTxnMgr;
- txnMgr.mLock.lock();
- try {
- if (mTxn == null) {
- Txn parent = (mParent == null || mTop) ? null : mParent.getTxn();
- if (mTimeoutUnit == null) {
- mTxn = txnMgr.createTxn(parent, mLevel);
- } else {
- mTxn = txnMgr.createTxn(parent, mLevel, mDesiredLockTimeout, mTimeoutUnit);
- }
+ if (mTxn == null) {
+ TransactionManager<Txn> txnMgr = mTxnMgr;
+ Txn parent = (mParent == null || mTop) ? null : mParent.getTxn();
+ if (mTimeoutUnit == null) {
+ mTxn = txnMgr.createTxn(parent, mLevel);
+ } else {
+ mTxn = txnMgr.createTxn(parent, mLevel, mDesiredLockTimeout, mTimeoutUnit);
}
- return mTxn;
- } finally {
- txnMgr.mLock.unlock();
}
+ return mTxn;
}
+ // Caller must hold mLock.
private void closeCursors() throws PersistException {
if (mCursorList != null) {
mCursorList.closeCursors();
|