[sgen] Don't use pthread_once() to init a TLS key, do it at GC init.

kangaroo · Jul 28, 2011 · d3729e9 · d3729e9
1 parent 5a35198
commit d3729e9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
@@ -2040,9 +2040,6 @@ init_user_copy_or_mark_key (void)
 static void
 set_user_copy_or_mark_data (UserCopyOrMarkData *data)
 {
-	static pthread_once_t init_control = PTHREAD_ONCE_INIT;
-	pthread_once (&init_control, init_user_copy_or_mark_key);
-
 	pthread_setspecific (user_copy_or_mark_key, data);
 }
 
@@ -6590,6 +6587,8 @@ mono_gc_base_init (void)
 	LOCK_INIT (global_remset_mutex);
 	LOCK_INIT (pin_queue_mutex);
 
+	init_user_copy_or_mark_key ();
+
 	if ((env = getenv ("MONO_GC_PARAMS"))) {
 		opts = g_strsplit (env, ",", -1);
 		for (ptr = opts; *ptr; ++ptr) {