1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
--- 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(;;) {
|
GitWeb