ObjFW  Diff

Differences From Artifact [608d6df3a8]:

To Artifact [9dc6dfa8c4]:


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
95
96
97

98
99


100
101


102
103
104


105
106

107
108
109

110
111
112

113
114
115
116



117
118

119
120
121
122


123
124

125
126

127
128
129

130
131
132

133
134
135

136
137
138
139



140
141

142
143
144
145


146
147

148
149

150
151
152

153
154
155

156
157
158

159
160
161
162



163
164

165
166
167
168


169
170
171


172
173

174
175
176

177
178


179
180


181
182
183


184
185

186
187
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
95
96
97
98

99
100
101
102
103


104
105
106


107
108
109

110
111
112

113
114
115
116
117
118
119


120
121
122
123

124
125
126


127
128
129

130
131

132
133
134

135
136
137

138
139
140
141
142
143
144


145
146
147
148

149
150
151


152
153
154

155
156

157
158
159

160
161
162

163
164
165
166
167
168
169


170
171
172
173

174
175
176


177
178
179


180
181
182

183
184
185

186
187
188
189
190


191
192
193


194
195
196

197
198
199







-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+



-
+


+


-
-
+
+

-
-
+
+
+

-
-
+
+

-
-
+
+

-
+


-
+





-
+





-
+





-
+





-
+


+
+
-
-
+
+

-
-
+
+

-
+


-
+



+


-
-
+
+
+

-
+


-
-
+
+

-
+

-
+


-
+


-
+



+


-
-
+
+
+

-
+


-
-
+
+

-
+

-
+


-
+


-
+



+


-
-
+
+
+

-
+


-
-
+
+

-
-
+
+

-
+


-
+


+
+
-
-
+
+

-
-
+
+

-
+


 * file.
 */

#include "config.h"

#import "mutex.h"

bool
int
of_mutex_new(of_mutex_t *mutex)
{
	return (pthread_mutex_init(mutex, NULL) == 0);
	return pthread_mutex_init(mutex, NULL);
}

bool
int
of_mutex_lock(of_mutex_t *mutex)
{
	return (pthread_mutex_lock(mutex) == 0);
	return pthread_mutex_lock(mutex);
}

bool
int
of_mutex_trylock(of_mutex_t *mutex)
{
	return (pthread_mutex_trylock(mutex) == 0);
	return pthread_mutex_trylock(mutex);
}

bool
int
of_mutex_unlock(of_mutex_t *mutex)
{
	return (pthread_mutex_unlock(mutex) == 0);
	return pthread_mutex_unlock(mutex);
}

bool
int
of_mutex_free(of_mutex_t *mutex)
{
	return (pthread_mutex_destroy(mutex) == 0);
	return pthread_mutex_destroy(mutex);
}

#ifdef OF_HAVE_RECURSIVE_PTHREAD_MUTEXES
bool
int
of_rmutex_new(of_rmutex_t *rmutex)
{
	int error;
	pthread_mutexattr_t attr;

	if (pthread_mutexattr_init(&attr) != 0)
		return false;
	if ((error = pthread_mutexattr_init(&attr)) != 0)
		return error;

	if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0)
		return false;
	if ((error = pthread_mutexattr_settype(&attr,
	    PTHREAD_MUTEX_RECURSIVE)) != 0)
		return error;

	if (pthread_mutex_init(rmutex, &attr) != 0)
		return false;
	if ((error = pthread_mutex_init(rmutex, &attr)) != 0)
		return error;

	if (pthread_mutexattr_destroy(&attr) != 0)
		return false;
	if ((error = pthread_mutexattr_destroy(&attr)) != 0)
		return error;

	return true;
	return 0;
}

bool
int
of_rmutex_lock(of_rmutex_t *rmutex)
{
	return of_mutex_lock(rmutex);
}

bool
int
of_rmutex_trylock(of_rmutex_t *rmutex)
{
	return of_mutex_trylock(rmutex);
}

bool
int
of_rmutex_unlock(of_rmutex_t *rmutex)
{
	return of_mutex_unlock(rmutex);
}

bool
int
of_rmutex_free(of_rmutex_t *rmutex)
{
	return of_mutex_free(rmutex);
}
#else
bool
int
of_rmutex_new(of_rmutex_t *rmutex)
{
	int error;

	if (!of_mutex_new(&rmutex->mutex))
		return false;
	if ((error = of_mutex_new(&rmutex->mutex)) != 0)
		return error;

	if (!of_tlskey_new(&rmutex->count))
		return false;
	if ((error = of_tlskey_new(&rmutex->count)) != 0)
		return error;

	return true;
	return 0;
}

bool
int
of_rmutex_lock(of_rmutex_t *rmutex)
{
	uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
	int error;

	if (count > 0) {
		if (!of_tlskey_set(rmutex->count, (void *)(count + 1)))
			return false;
		if ((error = of_tlskey_set(rmutex->count,
		    (void *)(count + 1))) != 0)
			return error;

		return true;
		return 0;
	}

	if (!of_mutex_lock(&rmutex->mutex))
		return false;
	if ((error = of_mutex_lock(&rmutex->mutex)) != 0)
		return error;

	if (!of_tlskey_set(rmutex->count, (void *)1)) {
	if ((error = of_tlskey_set(rmutex->count, (void *)1)) != 0) {
		of_mutex_unlock(&rmutex->mutex);
		return false;
		return error;
	}

	return true;
	return 0;
}

bool
int
of_rmutex_trylock(of_rmutex_t *rmutex)
{
	uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
	int error;

	if (count > 0) {
		if (!of_tlskey_set(rmutex->count, (void *)(count + 1)))
			return false;
		if ((error = of_tlskey_set(rmutex->count,
		    (void *)(count + 1))) != 0)
			return error;

		return true;
		return 0;
	}

	if (!of_mutex_trylock(&rmutex->mutex))
		return false;
	if ((error = of_mutex_trylock(&rmutex->mutex)) != 0)
		return error;

	if (!of_tlskey_set(rmutex->count, (void *)1)) {
	if ((error = of_tlskey_set(rmutex->count, (void *)1)) != 0) {
		of_mutex_unlock(&rmutex->mutex);
		return false;
		return error;
	}

	return true;
	return 0;
}

bool
int
of_rmutex_unlock(of_rmutex_t *rmutex)
{
	uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
	int error;

	if (count > 1) {
		if (!of_tlskey_set(rmutex->count, (void *)(count - 1)))
			return false;
		if ((error = of_tlskey_set(rmutex->count,
		    (void *)(count - 1))) != 0)
			return error;

		return true;
		return 0;
	}

	if (!of_tlskey_set(rmutex->count, (void *)0))
		return false;
	if ((error = of_tlskey_set(rmutex->count, (void *)0)) != 0)
		return error;

	if (!of_mutex_unlock(&rmutex->mutex))
		return false;
	if ((error = of_mutex_unlock(&rmutex->mutex)) != 0)
		return error;

	return true;
	return 0;
}

bool
int
of_rmutex_free(of_rmutex_t *rmutex)
{
	int error;

	if (!of_mutex_free(&rmutex->mutex))
		return false;
	if ((error = of_mutex_free(&rmutex->mutex)) != 0)
		return error;

	if (!of_tlskey_free(rmutex->count))
		return false;
	if ((error = of_tlskey_free(rmutex->count)) != 0)
		return error;

	return true;
	return 0;
}
#endif