review gc threads info access

src/debugger.c

@@ -33,7 +33,6 @@ HL_API hl_socket *hl_socket_accept( hl_socket *s );
 HL_API int hl_socket_send( hl_socket *s, vbyte *buf, int pos, int len );
 HL_API int hl_socket_recv( hl_socket *s, vbyte *buf, int pos, int len );
 HL_API void hl_sys_sleep( double t );
-HL_API void *hl_gc_threads_info();
 HL_API int hl_sys_getpid();
 
 HL_API int hl_closure_stack_capture;

src/gc.c

@@ -160,12 +160,7 @@ static void gc_free_page( gc_pheader *page, int block_count );
 #include "allocator.c"
 #endif
 
-static struct {
-	int count;
-	bool stopping_world;
-	hl_thread_info **threads;
-	hl_mutex *global_lock;
-} gc_threads;
+static hl_threads_info gc_threads;
 
 HL_THREAD_STATIC_VAR hl_thread_info *current_thread;
 
@@ -325,7 +320,7 @@ HL_API void hl_unregister_thread() {
 	hl_mutex_release(gc_threads.global_lock);
 }
 
-HL_API void *hl_gc_threads_info() {
+HL_API hl_threads_info *hl_gc_threads_info() {
 	return &gc_threads;
 }
 

src/hl.h

@@ -916,7 +916,15 @@ typedef struct {
 	int extra_stack_size;
 } hl_thread_info;
 
+typedef struct {
+	int count;
+	bool stopping_world;
+	hl_thread_info **threads;
+	hl_mutex *global_lock;
+} hl_threads_info;
+
 HL_API hl_thread_info *hl_get_thread();
+HL_API hl_threads_info *hl_gc_threads_info();
 
 #ifdef HL_TRACK_ENABLE
 

src/profile.c

@@ -42,17 +42,10 @@
 #define MAX_STACK_COUNT 2048
 
 HL_API double hl_sys_time( void );
-HL_API void *hl_gc_threads_info( void );
 HL_API void hl_setup_profiler( void *, void * );
 int hl_module_capture_stack_range( void *stack_top, void **stack_ptr, void **out, int size );
 uchar *hl_module_resolve_symbol_full( void *addr, uchar *out, int *outSize, int **r_debug_addr );
 
-typedef struct {
-	int count;
-	bool stopping_world;
-	hl_thread_info **threads;
-} hl_gc_threads;
-
 typedef struct _thread_handle thread_handle;
 typedef struct _profile_data profile_data;
 
@@ -211,8 +204,8 @@ static void read_thread_data( thread_handle *t ) {
 #endif
 	int eventId = count | 0x80000000;
 	double time = hl_sys_time();
-	struct { int count; bool stop; } *gc = hl_gc_threads_info();
-	if( gc->stop ) eventId |= 0x40000000;
+	hl_threads_info *gc = hl_gc_threads_info();
+	if( gc->stopping_world ) eventId |= 0x40000000;
 	record_data(&time,sizeof(double));
 	record_data(&t->tid,sizeof(int));
 	record_data(&eventId,sizeof(int));
@@ -230,7 +223,7 @@ static void hl_profile_loop( void *_ ) {
 			data.waitLoop = false;
 			continue;
 		}
-		hl_gc_threads *threads = (hl_gc_threads*)hl_gc_threads_info();
+		hl_threads_info *threads = hl_gc_threads_info();
 		int i;
 		thread_handle *prev = NULL;
 		thread_handle *cur = data.handles;
@@ -254,9 +247,11 @@ static void hl_profile_loop( void *_ ) {
 		}
 		if( prev ) prev->next = NULL; else data.handles = NULL;
 		while( cur != NULL ) {
+			thread_handle *n;
 			thread_data_free(cur);
+			n = cur->next;
 			free(cur);
-			cur = cur->next;
+			cur = n;
 		}
 		next += wait_time;
 	}