Merge OTP-8681

7 files changed, 31 insertions, 57 deletions

diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index f8823b85fe..16ae643ed9 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -2897,17 +2897,10 @@ unsigned long erts_alc_test(unsigned long op,
 	}
 	case 0xf10: {
 	    ethr_tid *tid = erts_alloc(ERTS_ALC_T_UNDEF, sizeof(ethr_tid));
-#ifdef ERTS_ENABLE_LOCK_COUNT
-	    if (erts_lcnt_thr_create(tid,
-				(void * (*)(void *)) a1,
-				(void *) a2,
-				NULL) != 0)
-#else
 	    if (ethr_thr_create(tid,
 				(void * (*)(void *)) a1,
 				(void *) a2,
 				NULL) != 0)
-#endif
 		ERTS_ALC_TEST_ABORT;
 	    return (unsigned long) tid;
 	}
diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c
index 50d8c25c46..aa37edafd1 100644
--- a/erts/emulator/beam/erl_drv_thread.c
+++ b/erts/emulator/beam/erl_drv_thread.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2007-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2007-2010. All Rights Reserved.
+ *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
  * compliance with the License. You should have received a copy of the
  * Erlang Public License along with this software. If not, it can be
  * retrieved online at http://www.erlang.org/.
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * %CopyrightEnd%
  */
 
@@ -603,11 +603,7 @@ erl_drv_thread_create(char *name,
 	dtid->name = ((char *) dtid) + sizeof(struct ErlDrvTid_);
 	sys_strcpy(dtid->name, name);
     }
-#ifdef ERTS_ENABLE_LOCK_COUNT
-    res = erts_lcnt_thr_create(&dtid->tid, erl_drv_thread_wrapper, dtid, use_opts);
-#else
     res = ethr_thr_create(&dtid->tid, erl_drv_thread_wrapper, dtid, use_opts);
-#endif
 
     if (res != 0) {
 	erts_free(ERTS_ALC_T_DRV_TID, dtid);
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 2ee802cf3e..4a4507b212 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -702,6 +702,10 @@ early_init(int *argc, char **argv) /*
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_late_init();
 #endif
+    
+#ifdef ERTS_ENABLE_LOCK_COUNT
+    erts_lcnt_late_init();
+#endif
 
 #if defined(HIPE)
     hipe_signal_init();	/* must be done very early */
diff --git a/erts/emulator/beam/erl_lock_count.c b/erts/emulator/beam/erl_lock_count.c
index 0d7e1335c1..26028aeefc 100644
--- a/erts/emulator/beam/erl_lock_count.c
+++ b/erts/emulator/beam/erl_lock_count.c
@@ -257,6 +257,10 @@ void erts_lcnt_init() {
     erts_lcnt_clear_counters();
 }
 
+void erts_lcnt_late_init() {
+    erts_thr_install_exit_handler(erts_lcnt_thread_exit_handler);
+}
+
 /* list operations */
 
 /* BEGIN ASSUMPTION: lcnt_data_lock taken */
@@ -570,36 +574,26 @@ void erts_lcnt_trylock(erts_lcnt_lock_t *lock, int res) {
 
 /* thread operations */
 
-static void *lcnt_thr_init(erts_lcnt_thread_data_t *eltd) {
-    void *(*function)(void *);
-    void *argument;
-    void *res;
-    function = eltd->function;
-    argument = eltd->argument;
-    
-    ethr_tsd_set(lcnt_thr_data_key, eltd);
-    
-    res = (void *)function(argument);
-    free(eltd);
-    return (void *)res;
-}
-
-    
-
-int erts_lcnt_thr_create(ethr_tid *tid, void * (*function)(void *), void *arg, ethr_thr_opts *opts) {
+void erts_lcnt_thread_setup(void) {
     erts_lcnt_thread_data_t *eltd;
-    
+
     lcnt_lock();
     /* lock for thread id global update */
     eltd = lcnt_thread_data_alloc();
     lcnt_unlock();
-    
-    eltd->function = function;
-    eltd->argument = arg;
-
-    return ethr_thr_create(tid, (void *)lcnt_thr_init, (void *)eltd, opts);
+    ASSERT(eltd);
+    ethr_tsd_set(lcnt_thr_data_key, eltd);
 }
 
+void erts_lcnt_thread_exit_handler() {
+    erts_lcnt_thread_data_t *eltd;
+
+    eltd = ethr_tsd_get(lcnt_thr_data_key);
+
+    if (eltd) {
+        free(eltd);
+    }
+}
 
 /* bindings for bifs */
 
diff --git a/erts/emulator/beam/erl_lock_count.h b/erts/emulator/beam/erl_lock_count.h
index e3044c371f..6306580ae4 100644
--- a/erts/emulator/beam/erl_lock_count.h
+++ b/erts/emulator/beam/erl_lock_count.h
@@ -155,11 +155,6 @@ typedef struct {
     erts_lcnt_time_t timer;	/* timer         */
     int timer_set;		/* bool          */
     int lock_in_conflict;       /* bool          */
-    
-    /* function pointer */
-    void *(*function)(void *);
-    void *argument;
-    
 } erts_lcnt_thread_data_t;
 
 /* globals */
@@ -169,6 +164,11 @@ extern Uint16 erts_lcnt_rt_options;
 /* function declerations */
 
 void erts_lcnt_init(void);
+void erts_lcnt_late_init(void);
+
+/* thread operations */
+void erts_lcnt_thread_setup(void);
+void erts_lcnt_thread_exit_handler(void);
 
 /* list operations (local)  */
 erts_lcnt_lock_list_t *erts_lcnt_list_init(void);
@@ -194,12 +194,7 @@ void erts_lcnt_unlock_opt(erts_lcnt_lock_t *lock, Uint16 option);
 void erts_lcnt_trylock_opt(erts_lcnt_lock_t *lock, int res, Uint16 option);
 void erts_lcnt_trylock(erts_lcnt_lock_t *lock, int res);
 
-/* thread operations */
-
-int erts_lcnt_thr_create(ethr_tid *tid, void * (*function)(void *), void *arg, ethr_thr_opts *opts);
-
 /* bif interface */
-
 Uint16 erts_lcnt_set_rt_opt(Uint16 opt);
 Uint16 erts_lcnt_clear_rt_opt(Uint16 opt);
 void   erts_lcnt_clear_counters(void);
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index f4c889889d..bae17d1569 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -3114,11 +3114,7 @@ erts_start_schedulers(void)
 	ErtsSchedulerData *esdp = ERTS_SCHEDULER_IX(actual);
 	actual++;
 	ASSERT(actual == esdp->no);
-#ifdef ERTS_ENABLE_LOCK_COUNT
-	res = erts_lcnt_thr_create(&esdp->tid,sched_thread_func,(void*)esdp,&opts);
-#else
 	res = ethr_thr_create(&esdp->tid,sched_thread_func,(void*)esdp,&opts);
-#endif
 	if (res != 0) {
 	    actual--;
 	    break;
diff --git a/erts/emulator/beam/erl_threads.h b/erts/emulator/beam/erl_threads.h
index 21f85bd045..35b338c6eb 100644
--- a/erts/emulator/beam/erl_threads.h
+++ b/erts/emulator/beam/erl_threads.h
@@ -294,11 +294,7 @@ erts_thr_create(erts_tid_t *tid, void * (*func)(void *), void *arg,
 		erts_thr_opts_t *opts)
 {
 #ifdef USE_THREADS
-#ifdef ERTS_ENABLE_LOCK_COUNT
-    int res = erts_lcnt_thr_create(tid, func, arg, opts);
-#else
     int res = ethr_thr_create(tid, func, arg, opts);
-#endif
     if (res)
 	erts_thr_fatal_error(res, "create thread");
 #endif