ObjFW  Check-in [e379516a39]

Overview
Comment:Let of_tlskey_* use void* instead of id.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: e379516a39c05fd84aa3485f59fea7f58b788b7c30ddf47b02f8a543792ce460
User & Date: js on 2012-07-14 20:38:15
Other Links: manifest | tags
Context
2012-07-14
21:02
Fix forgotten __thread. check-in: eade7d765c user: js tags: trunk
20:38
Let of_tlskey_* use void* instead of id. check-in: e379516a39 user: js tags: trunk
20:00
New autorelease pools. check-in: f5927f8a84 user: js tags: trunk
Changes

Modified src/OFThread.m from [01ca359fa0] to [56a82e39ff].

135
136
137
138
139
140
141
142

143
144
145
146
147

148
149
150
151
152
153
154
135
136
137
138
139
140
141

142
143
144
145
146

147
148
149
150
151
152
153
154







-
+




-
+







							     selector: _cmd];

	[oldObject release];
}

+ (id)objectForTLSKey: (OFTLSKey*)key
{
	return [[of_tlskey_get(key->key) retain] autorelease];
	return [[(id)of_tlskey_get(key->key) retain] autorelease];
}

+ (OFThread*)currentThread
{
	return [[of_tlskey_get(threadSelf) retain] autorelease];
	return [[(id)of_tlskey_get(threadSelf) retain] autorelease];
}

+ (void)sleepForTimeInterval: (double)seconds
{
	if (seconds < 0)
		@throw [OFOutOfRangeException exceptionWithClass: self];

Modified src/threading.h from [3fbabbb84b] to [47f623ac86].

251
252
253
254
255
256
257
258

259
260
261
262

263
264

265
266
267
268
269
270
271
272
273
274
275

276
277
278
279
280
281
282
283
284
285
251
252
253
254
255
256
257

258
259
260
261

262
263

264
265






266
267
268

269
270


271
272
273
274
275
276
277







-
+



-
+

-
+

-
-
-
-
-
-



-
+

-
-







#if defined(OF_HAVE_PTHREADS)
	return !pthread_key_create(key, NULL);
#elif defined(_WIN32)
	return ((*key = TlsAlloc()) != TLS_OUT_OF_INDEXES);
#endif
}

static OF_INLINE id
static OF_INLINE void*
of_tlskey_get(of_tlskey_t key)
{
#if defined(OF_HAVE_PTHREADS)
	void *ret = pthread_getspecific(key);
	return pthread_getspecific(key);
#elif defined(_WIN32)
	void *ret = TlsGetValue(key);
	return TlsGetValue(key);
#endif

	/* NULL and nil might be different! */
	if (ret == NULL)
		return nil;

	return (id)ret;
}

static OF_INLINE BOOL
of_tlskey_set(of_tlskey_t key, id obj)
of_tlskey_set(of_tlskey_t key, void *ptr)
{
	void *ptr = (obj != nil ? (void*)obj : NULL);

#if defined(OF_HAVE_PTHREADS)
	return !pthread_setspecific(key, ptr);
#elif defined(_WIN32)
	return TlsSetValue(key, ptr);
#endif
}