Refactor thread local storage

Author: Apprentice-Alchemist

src/gc.c

@@ -308,6 +308,22 @@ HL_PRIM gc_pheader *hl_gc_get_page( void *v ) {
 
 HL_API int hl_thread_id();
 
+HL_PRIM int hl_atomic_add32(int *a, int b);
+
+static int tls_counter = 0;
+
+int get_tls_slot() {
+	return hl_atomic_add32(&tls_counter, 1);
+}
+
+void free_tls_slot(int key) {
+	// this should only run in the finalizer, which is called when all threads
+	// are stopped
+	for (int i = 0; i < gc_threads.count; i++) {
+		hl_hiremove(gc_threads.threads[i]->tls_slots, key);
+	}
+}
+
 HL_API void hl_register_thread( void *stack_top ) {
 	if( hl_get_thread() )
 		hl_fatal("Thread already registered");
@@ -324,6 +340,8 @@ HL_API void hl_register_thread( void *stack_top ) {
 	current_thread = t;
 	hl_add_root(&t->exc_value);
 	hl_add_root(&t->exc_handler);
+	hl_add_root(&t->tls_slots);
+	t->tls_slots = hl_hialloc();
 
 	gc_global_lock(true);
 	hl_thread_info **all = (hl_thread_info**)malloc(sizeof(void*) * (gc_threads.count + 1));
@@ -340,6 +358,7 @@ HL_API void hl_unregister_thread() {
 		hl_fatal("Thread not registered");
 	hl_remove_root(&t->exc_value);
 	hl_remove_root(&t->exc_handler);
+	hl_remove_root(&t->tls_slots);
 	gc_global_lock(true);
 	for(i=0;i<gc_threads.count;i++)
 		if( gc_threads.threads[i] == t ) {

src/hl.h

@@ -785,7 +785,6 @@ HL_API void hl_condition_free(hl_condition *cond);
 HL_API hl_tls *hl_tls_alloc( bool gc_value );
 HL_API void hl_tls_set( hl_tls *l, void *value );
 HL_API void *hl_tls_get( hl_tls *l );
-HL_API void hl_tls_free( hl_tls *l );
 
 // ----------------------- ALLOC --------------------------------------------------
 
@@ -843,6 +842,17 @@ HL_API uchar *hl_to_string( vdynamic *v );
 HL_API const uchar *hl_type_str( hl_type *t );
 HL_API void hl_throw_buffer( hl_buffer *b );
 
+// Maps
+
+struct hl_hi_map;
+typedef struct hl_hi_map hl_hi_map;
+
+HL_API hl_hi_map *hl_hialloc();
+HL_API void hl_hiset(hl_hi_map *, int, vdynamic *);
+HL_API bool hl_hiexists(hl_hi_map *, int);
+HL_API vdynamic *hl_higet(hl_hi_map *, int);
+HL_API bool hl_hiremove(hl_hi_map *, int);
+
 // ----------------------- FFI ------------------------------------------------------
 
 // match GNU C++ mangling
@@ -984,6 +994,7 @@ typedef struct {
 	thread_t mach_thread_id;
 	pthread_t pthread_id;
 	#endif
+	hl_hi_map *tls_slots;
 } hl_thread_info;
 
 typedef struct {

src/std/maps.c

@@ -45,8 +45,9 @@ typedef struct {
 } hl_free_list;
 
 static void hl_freelist_resize( hl_free_list *f, int newsize ) {
-	hl_free_bucket *buckets = (hl_free_bucket*)hl_gc_alloc_noptr(sizeof(hl_free_bucket)*newsize);
+	hl_free_bucket *buckets = (hl_free_bucket*)malloc(sizeof(hl_free_bucket)*newsize);
 	memcpy(buckets,f->buckets,f->head * sizeof(hl_free_bucket));
+	free(f->buckets);
 	f->buckets = buckets;
 	f->nbuckets = newsize;
 }

src/std/maps.h

@@ -16,7 +16,7 @@
 #define _MSTATIC static
 #endif
 
-typedef struct {
+typedef struct t_map {
 	void *cells;
 	void *nexts;
 	t_entry *entries;

src/std/thread.c

@@ -64,13 +64,6 @@ struct _hl_condition {
 	CRITICAL_SECTION cs;
 	CONDITION_VARIABLE cond;
 };
-
-struct _hl_tls {
-	void (*free)( hl_tls * );
-	DWORD tid;
-	bool gc;
-};
-
 #else
 
 #	include <pthread.h>
@@ -104,13 +97,6 @@ struct _hl_condition {
 	pthread_mutex_t mutex;
 	pthread_cond_t cond;
 };
-
-struct _hl_tls {
-	void (*free)( hl_tls * );
-	pthread_key_t key;
-	bool gc;
-};
-
 #endif
 
 // ----------------- ALLOC
@@ -463,95 +449,31 @@ DEFINE_PRIM(_VOID, condition_broadcast, _CONDITION)
 
 // ----------------- THREAD LOCAL
 
-#if defined(HL_THREADS)
-static void **_tls_get( hl_tls *t ) {
-#	ifdef HL_WIN
-	return (void**)TlsGetValue(t->tid);
-#	else
-	return (void**)pthread_getspecific(t->key);
-#	endif
-}
-static void _tls_set( hl_tls *t, void *store ) {
-#	ifdef HL_WIN
-	TlsSetValue(t->tid, store);
-#	else
-	pthread_setspecific(t->key, store);
-#	endif
-}
-#endif
+int get_tls_slot();
+void free_tls_slot(int id);
+
+struct _hl_tls {
+	void (*free)( hl_tls * );
+	int key;
+	bool gc;
+};
+
+static void tls_free(hl_tls *l) { free_tls_slot(l->key); }
 
 HL_PRIM hl_tls *hl_tls_alloc( bool gc_value ) {
-#	if !defined(HL_THREADS)
 	hl_tls *l = (hl_tls*)hl_gc_alloc_finalizer(sizeof(hl_tls));
-	l->free = hl_tls_free;
-	l->value = NULL;
-	return l;
-#	elif defined(HL_WIN)
-	hl_tls *l = (hl_tls*)hl_gc_alloc_finalizer(sizeof(hl_tls));
-	l->free = hl_tls_free;
-	l->tid = TlsAlloc();
-	l->gc = gc_value;
-	TlsSetValue(l->tid,NULL);
-	return l;
-#	else
-	hl_tls *l = (hl_tls*)hl_gc_alloc_finalizer(sizeof(hl_tls));
-	l->free = hl_tls_free;
+	l->free = tls_free;
 	l->gc = gc_value;
-	pthread_key_create(&l->key,NULL);
+	l->key = get_tls_slot();
 	return l;
-#	endif
-}
-
-HL_PRIM void hl_tls_free( hl_tls *l ) {
-#	if !defined(HL_THREADS)
-	free(l);
-#	elif defined(HL_WIN)
-	if( l->free ) {
-		TlsFree(l->tid);
-		l->free = NULL;
-	}
-#	else
-	if( l->free ) {
-		pthread_key_delete(l->key);
-		l->free = NULL;
-	}
-#	endif
 }
 
 HL_PRIM void hl_tls_set( hl_tls *l, void *v ) {
-#	if !defined(HL_THREADS)
-	l->value = v;
-#	else
-	if( l->gc ) {
-		void **store = _tls_get(l);
-		if( !store) {
-			if( !v )
-				return;
-			store = (void**)malloc(sizeof(void*));
-			hl_add_root(store);
-			_tls_set(l, store);
-		} else {
-			if( !v ) {
-				free(store);
-				hl_remove_root(store);
-				_tls_set(l, NULL);
-				return;
-			}
-		}
-		*store = v;
-	} else
-		_tls_set(l, v);
-#	endif
+	hl_hiset(hl_get_thread()->tls_slots, l->key, v);
 }
 
 HL_PRIM void *hl_tls_get( hl_tls *l ) {
-#	if !defined(HL_THREADS)
-	return l->value;
-#	else
-	void **store = _tls_get(l);
-	if( !l->gc ) return store;
-	return store ? *store : NULL;
-#	endif
+	return hl_higet(hl_get_thread()->tls_slots, l->key);
 }
 
 #define _TLS _ABSTRACT(hl_tls)