ObjFW  Diff

Annotate Patch Unified Diff

Differences From Artifact [531ff2d312]:

To Artifact [9f958f8552]:

︙︙
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
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
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269

#include "config.h"

#include <stddef.h>
#include <stdlib.h>

#ifndef _WIN32
#include <pthread.h>
#else




#include <windows.h>
#endif



struct locks_s {
	id		obj;
	size_t		count;
	size_t		recursion;
#ifndef _WIN32
	pthread_t	thread;
	pthread_mutex_t	mutex;
#else
	HANDLE		thread;
	HANDLE		mutex;
#endif
};

static int initialized = 0;
#ifndef _WIN32
static pthread_mutex_t mutex;
#else
static HANDLE mutex;
#endif
static struct locks_s *locks = NULL;
static size_t num_locks = 0;

















































































int
objc_sync_enter(id obj)
{
	size_t i;

	/*
	 * FIXME:
	 * Theoretically, it's possible to encounter a race condition during
	 * initialization.
	 */
	if (!initialized) {
#ifndef _WIN32
		if (pthread_mutex_init(&mutex, NULL))
#else
		if ((mutex = CreateMutex(NULL, FALSE, NULL)) == NULL)
#endif
			return 1;

		initialized = 1;
	}

#ifndef _WIN32
	if (pthread_mutex_lock(&mutex))
#else
	if (WaitForSingleObject(mutex, INFINITE) != WAIT_OBJECT_0)
		return 1;
#endif

	for (i = 0; i < num_locks; i++) {
		if (locks[i].obj == obj) {
#ifndef _WIN32
			if (pthread_equal(pthread_self(), locks[i].thread))
#else
			if (locks[i].thread == GetCurrentThread())
#endif
				locks[i].recursion++;
			else
#ifndef _WIN32
				if (pthread_mutex_lock(&locks[i].mutex)) {
					pthread_mutex_unlock(&mutex);
					return 1;
				}
#else
				if (WaitForSingleObject(locks[i].mutex,
				    INFINITE) != WAIT_OBJECT_0) {
					ReleaseMutex(mutex);
					return 1;
				}
#endif

			locks[i].count++;

#ifndef _WIN32
			if (pthread_mutex_unlock(&locks[i].mutex))
#else
			if (!ReleaseMutex(mutex))
#endif
				return 1;

			return 0;
		}
	}

	if (locks == NULL) {
		if ((locks = malloc(sizeof(struct locks_s))) == NULL) {
#ifndef _WIN32
			pthread_mutex_unlock(&mutex);
#else
			ReleaseMutex(mutex);
#endif
			return 1;
		}
	} else {
		struct locks_s *new_locks;

		if ((new_locks = realloc(locks, (num_locks + 1) *
		    sizeof(struct locks_s))) == NULL) {
#ifndef _WIN32
			pthread_mutex_unlock(&mutex);
#else
			ReleaseMutex(mutex);
#endif
			return 1;
		}

		locks = new_locks;
	}

	locks[num_locks].obj = obj;
	locks[num_locks].count = 1;
	locks[num_locks].recursion = 0;

#ifndef _WIN32
	locks[num_locks].thread = pthread_self();

	if (pthread_mutex_init(&locks[num_locks].mutex, NULL)) {
		pthread_mutex_unlock(&mutex);
		return 1;
	}

	if (pthread_mutex_lock(&locks[num_locks].mutex)) {
		pthread_mutex_unlock(&mutex);
		return 1;
	}
#else
	locks[num_locks].thread = GetCurrentThread();

	if ((locks[num_locks].mutex = CreateMutex(NULL, TRUE, NULL)) == NULL) {
		ReleaseMutex(mutex);
		return 1;
	}
#endif

	num_locks++;

#ifndef _WIN32
	if (pthread_mutex_unlock(&mutex))
#else
	if (!ReleaseMutex(mutex))
#endif
		return 1;

	return 0;
}

int
objc_sync_exit(id obj)
{
	size_t i;



#ifndef _WIN32
	if (pthread_mutex_lock(&mutex))
#else
	if (WaitForSingleObject(mutex, INFINITE) != WAIT_OBJECT_0)
		return 1;
#endif

	for (i = 0; i < num_locks; i++) {
		if (locks[i].obj == obj) {
#ifndef _WIN32
			if (pthread_equal(pthread_self(), locks[i].thread) &&
			    locks[i].recursion) {

				locks[i].recursion--;

				if (pthread_mutex_unlock(&mutex))
					return 1;

				return 0;
			}
#else
			if (locks[i].thread == GetCurrentThread() &&
			    locks[i].recursion) {
				locks[i].recursion--;

				if (!ReleaseMutex(mutex))
					return 1;

				return 0;
			}
#endif

#ifndef _WIN32
			if (pthread_mutex_unlock(&locks[i].mutex)) {
				pthread_mutex_unlock(&mutex);
				return 1;
			}
#else
			if (!ReleaseMutex(locks[i].mutex)) {
				ReleaseMutex(mutex);
				return 1;
			}
#endif

			locks[i].count--;

			if (locks[i].count == 0) {
				struct locks_s *new_locks;

#ifndef _WIN32
				if (pthread_mutex_destroy(&locks[i].mutex)) {
					pthread_mutex_unlock(&mutex);
					return 1;
				}
#else
				if (!CloseHandle(locks[i].mutex)) {
					ReleaseMutex(mutex);
					return 1;
				}
#endif

				num_locks--;
				locks[i] = locks[num_locks];

				if ((new_locks = realloc(locks, (num_locks) *
				    sizeof(struct locks_s))) == NULL) {
#ifndef _WIN32
					pthread_mutex_unlock(&mutex);
#else
					ReleaseMutex(mutex);
#endif
					return 1;
				}

				locks = new_locks;
			}

#ifndef _WIN32
			if (pthread_mutex_unlock(&mutex))
#else
			if (!ReleaseMutex(mutex))
#endif
				return 1;

			return 0;
		}
	}

#ifndef _WIN32
	pthread_mutex_unlock(&mutex);
#else
	ReleaseMutex(mutex);
#endif

	return 1;
}








|
>
>
>
>


>
>














<







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>






<
<
<
<
<
|
<
<
<
<
<
|

<
<
<
<
|
<
<

<



<
|
<
<
<


<
|
|


<
<
<
<
<
<
<



<
|
<
<
<








<
|
<
<
<







<
|
<
<
<









<
<
|

|
|



|
|


<
<

<
<
<
<
<
<


<
|
<
<
<










>
>
|
|
<
<

<



<
<
|
>


|




<
<
<
<

<
<
<
<
<
<
<
<
|
|


<
<
<
<
<
<






<
|
|


<
<
<
<
<
<






<
|
<
<
<






<
|
<
<
<






<
|
<
<
<
<



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
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
200
201
202
203
204
205
206
207
208


209

210
211
212


213
214
215
216
217
218
219
220
221




222








223
224
225
226






227
228
229
230
231
232

233
234
235
236






237
238
239
240
241
242

243



244
245
246
247
248
249

250



251
252
253
254
255
256

257




258
259

#include "config.h"

#include <stddef.h>
#include <stdlib.h>

#ifndef _WIN32
#include <pthread.h>
#endif

#import <objc/objc.h>

#ifdef _WIN32
#include <windows.h>
#endif

#import "OFMacros.h"

struct locks_s {
	id		obj;
	size_t		count;
	size_t		recursion;
#ifndef _WIN32
	pthread_t	thread;
	pthread_mutex_t	mutex;
#else
	HANDLE		thread;
	HANDLE		mutex;
#endif
};


#ifndef _WIN32
static pthread_mutex_t mutex;
#else
static HANDLE mutex;
#endif
static struct locks_s *locks = NULL;
static size_t num_locks = 0;

#ifndef _WIN32
static OF_INLINE BOOL
mutex_new(pthread_mutex_t *m)
{
	return (pthread_mutex_init(m, NULL) ? NO : YES);
}

static OF_INLINE BOOL
mutex_free(pthread_mutex_t *m)
{
	return (pthread_mutex_destroy(m) ? NO : YES);
}

static OF_INLINE BOOL
mutex_lock(pthread_mutex_t *m)
{
	return (pthread_mutex_lock(m) ? NO : YES);
}

static OF_INLINE BOOL
mutex_unlock(pthread_mutex_t *m)
{
	return (pthread_mutex_unlock(m) ? NO : YES);
}

static OF_INLINE BOOL
thread_is_current(pthread_t t)
{
	return (pthread_equal(t, pthread_self()) ? YES : NO);
}

static OF_INLINE pthread_t
thread_current()
{
	return pthread_self();
}
#else
static OF_INLINE BOOL
mutex_new(HANDLE *m)
{
	return (((*m = CreateMutex(NULL, FALSE, NULL)) != NULL) ? YES : NO);
}

static OF_INLINE BOOL
mutex_free(HANDLE *m)
{
	return (CloseHandle(*m) ? YES : NO);
}

static OF_INLINE BOOL
mutex_lock(HANDLE *m)
{
	return (WaitForSingleObject(*m, INFINITE) == WAIT_OBJECT_0 ? YES : NO);
}

static OF_INLINE BOOL
mutex_unlock(HANDLE *m)
{
	return (ReleaseMutex(*m) ? YES : NO);
}

static OF_INLINE BOOL
thread_is_current(HANDLE t)
{
	return (t == GetCurrentThread() ? YES : NO);
}

static OF_INLINE HANDLE
thread_current()
{
	return GetCurrentThread();
}
#endif

BOOL
objc_sync_init()
{
	return (mutex_new(&mutex) ? YES : NO);
}

int
objc_sync_enter(id obj)
{
	size_t i;






	if (obj == nil)





		return 0;





	if (!mutex_lock(&mutex))


		return 1;


	for (i = 0; i < num_locks; i++) {
		if (locks[i].obj == obj) {

			if (thread_is_current(locks[i].thread))



				locks[i].recursion++;
			else

				if (!mutex_lock(&locks[i].mutex)) {
					mutex_unlock(&mutex);
					return 1;
				}








			locks[i].count++;


			if (!mutex_unlock(&mutex))



				return 1;

			return 0;
		}
	}

	if (locks == NULL) {
		if ((locks = malloc(sizeof(struct locks_s))) == NULL) {

			mutex_unlock(&mutex);



			return 1;
		}
	} else {
		struct locks_s *new_locks;

		if ((new_locks = realloc(locks, (num_locks + 1) *
		    sizeof(struct locks_s))) == NULL) {

			mutex_unlock(&mutex);



			return 1;
		}

		locks = new_locks;
	}

	locks[num_locks].obj = obj;
	locks[num_locks].count = 1;
	locks[num_locks].recursion = 0;


	locks[num_locks].thread = thread_current();

	if (!mutex_new(&locks[num_locks].mutex)) {
		mutex_unlock(&mutex);
		return 1;
	}

	if (!mutex_lock(&locks[num_locks].mutex)) {
		mutex_unlock(&mutex);
		return 1;
	}









	num_locks++;


	if (!mutex_unlock(&mutex))



		return 1;

	return 0;
}

int
objc_sync_exit(id obj)
{
	size_t i;

	if (obj == nil)
		return 0;

	if (!mutex_lock(&mutex))


		return 1;


	for (i = 0; i < num_locks; i++) {
		if (locks[i].obj == obj) {


			if (locks[i].recursion > 0 &&
			    thread_is_current(locks[i].thread)) {
				locks[i].recursion--;

				if (!mutex_unlock(&mutex))
					return 1;

				return 0;
			}













			if (!mutex_unlock(&locks[i].mutex)) {
				mutex_unlock(&mutex);
				return 1;
			}







			locks[i].count--;

			if (locks[i].count == 0) {
				struct locks_s *new_locks;


				if (!mutex_free(&locks[i].mutex)) {
					mutex_unlock(&mutex);
					return 1;
				}







				num_locks--;
				locks[i] = locks[num_locks];

				if ((new_locks = realloc(locks, (num_locks) *
				    sizeof(struct locks_s))) == NULL) {

					mutex_unlock(&mutex);



					return 1;
				}

				locks = new_locks;
			}


			if (!mutex_unlock(&mutex))



				return 1;

			return 0;
		}
	}


	mutex_unlock(&mutex);




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