ObjFW  Diff

Patch Side-by-side Diff

Differences From Artifact [49be18c2e5]:

To Artifact [d80afbd5eb]:

︙
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

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








-
+


-
+





-
+





-
+





-
+





-
+






-
+








 * Public License, either version 2 or 3, which can be found in the file
 * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
 * file.
 */

#include "config.h"

#import "mutex.h"
#import "OFPlainMutex.h"

int
of_mutex_new(of_mutex_t *mutex)
OFPlainMutexNew(OFPlainMutex *mutex)
{
	return pthread_mutex_init(mutex, NULL);
}

int
of_mutex_lock(of_mutex_t *mutex)
OFPlainMutexLock(OFPlainMutex *mutex)
{
	return pthread_mutex_lock(mutex);
}

int
of_mutex_trylock(of_mutex_t *mutex)
OFPlainMutexTryLock(OFPlainMutex *mutex)
{
	return pthread_mutex_trylock(mutex);
}

int
of_mutex_unlock(of_mutex_t *mutex)
OFPlainMutexUnlock(OFPlainMutex *mutex)
{
	return pthread_mutex_unlock(mutex);
}

int
of_mutex_free(of_mutex_t *mutex)
OFPlainMutexFree(OFPlainMutex *mutex)
{
	return pthread_mutex_destroy(mutex);
}

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

	if ((error = pthread_mutexattr_init(&attr)) != 0)
		return error;
︙
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

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








+
+
+
+
-
+
+
+

-
+



-
+

-
+



-
-
-
-
-
+
-
-

-
+



-
+



-
+


-
+






-
+

-
+



-
+






-
+


-
-
+
+







-
+

-
+



-
+






-
+


-
-
+
+







-
+

-
+



-
+






-
+


-
+






-
+



-
+


-
+






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

	return 0;
}

int
OFPlainRecursiveMutexLock(OFPlainRecursiveMutex *rmutex)
{
	return OFPlainMutexLock(rmutex);
}
of_rmutex_lock(of_rmutex_t *rmutex)

int
OFPlainRecursiveMutexTryLock(OFPlainRecursiveMutex *rmutex)
{
	return of_mutex_lock(rmutex);
	return OFPlainMutexTryLock(rmutex);
}

int
of_rmutex_trylock(of_rmutex_t *rmutex)
OFPlainRecursiveMutexUnlock(OFPlainRecursiveMutex *rmutex)
{
	return of_mutex_trylock(rmutex);
	return OFPlainMutexUnlock(rmutex);
}

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

OFPlainRecursiveMutexFree(OFPlainRecursiveMutex *rmutex)
int
of_rmutex_free(of_rmutex_t *rmutex)
{
	return of_mutex_free(rmutex);
	return OFPlainMutexFree(rmutex);
}
#else
int
of_rmutex_new(of_rmutex_t *rmutex)
OFPlainRecursiveMutexNew(OFPlainRecursiveMutex *rmutex)
{
	int error;

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

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

	return 0;
}

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

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

		return 0;
	}

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

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

	return 0;
}

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

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

		return 0;
	}

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

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

	return 0;
}

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

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

		return 0;
	}

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

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

	return 0;
}

int
of_rmutex_free(of_rmutex_t *rmutex)
OFPlainRecursiveMutexFree(OFPlainRecursiveMutex *rmutex)
{
	int error;

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

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

	return 0;
}
#endif
Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.019s