You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
|
--- a/include/zthread/Guard.h
|
|
|
|
+++ b/include/zthread/Guard.h
|
|
|
|
@@ -491,7 +491,7 @@
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
- if(!isDisabled())
|
|
|
|
+ if(!LockHolder<LockType>::isDisabled())
|
|
|
|
LockingPolicy::destroyScope(*this);
|
|
|
|
|
|
|
|
} catch (...) { /* ignore */ }
|
|
|
|
--- a/src/MutexImpl.h
|
|
|
|
+++ b/src/MutexImpl.h
|
|
|
|
@@ -153,7 +153,7 @@
|
|
|
|
|
|
|
|
_owner = self;
|
|
|
|
|
|
|
|
- ownerAcquired(self);
|
|
|
|
+ MutexImpl<List,Behavior>::ownerAcquired(self);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -164,7 +164,7 @@
|
|
|
|
_waiters.insert(self);
|
|
|
|
m.acquire();
|
|
|
|
|
|
|
|
- waiterArrived(self);
|
|
|
|
+ MutexImpl<List, Behavior>::waiterArrived(self);
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
@@ -173,7 +173,7 @@
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
- waiterDeparted(self);
|
|
|
|
+ MutexImpl<List, Behavior>::waiterDeparted(self);
|
|
|
|
|
|
|
|
m.release();
|
|
|
|
|
|
|
|
@@ -192,7 +192,7 @@
|
|
|
|
assert(_owner == 0);
|
|
|
|
_owner = self;
|
|
|
|
|
|
|
|
- ownerAcquired(self);
|
|
|
|
+ MutexImpl<List, Behavior>::ownerAcquired(self);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
@@ -236,7 +236,7 @@
|
|
|
|
|
|
|
|
_owner = self;
|
|
|
|
|
|
|
|
- ownerAcquired(self);
|
|
|
|
+ MutexImpl<List, Behavior>::ownerAcquired(self);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -253,7 +253,7 @@
|
|
|
|
|
|
|
|
m.acquire();
|
|
|
|
|
|
|
|
- waiterArrived(self);
|
|
|
|
+ MutexImpl<List, Behavior>:: waiterArrived(self);
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
@@ -262,7 +262,7 @@
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
- waiterDeparted(self);
|
|
|
|
+ MutexImpl<List, Behavior>::waiterDeparted(self);
|
|
|
|
|
|
|
|
m.release();
|
|
|
|
|
|
|
|
@@ -284,7 +284,7 @@
|
|
|
|
assert(0 == _owner);
|
|
|
|
_owner = self;
|
|
|
|
|
|
|
|
- ownerAcquired(self);
|
|
|
|
+ MutexImpl<List, Behavior>::ownerAcquired(self);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
@@ -326,7 +326,7 @@
|
|
|
|
|
|
|
|
_owner = 0;
|
|
|
|
|
|
|
|
- ownerReleased(impl);
|
|
|
|
+ MutexImpl<List, Behavior>::ownerReleased(impl);
|
|
|
|
|
|
|
|
// Try to find a waiter with a backoff & retry scheme
|
|
|
|
for(;;) {
|