From f03bce6a77ff5c7885a3b200fe879210299194bb Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Thu, 4 Dec 2014 11:00:22 +0100
Subject: erts: Add support for thread names

---
 erts/lib_src/pthread/ethread.c | 35 +++++++++++++++++++++++++++++++++++
 erts/lib_src/win/ethread.c     | 13 +++++++++++++
 2 files changed, 48 insertions(+)

(limited to 'erts/lib_src')

diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c
index 79784c5b84..340d085428 100644
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
@@ -42,6 +42,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
+#include <string.h>
 
 #include <limits.h>
 
@@ -77,6 +78,8 @@ typedef struct {
     void *(*thr_func)(void *);
     void *arg;
     void *prep_func_res;
+    char *name;
+    char name_buff[16];
 } ethr_thr_wrap_data__;
 
 static void *thr_wrapper(void *vtwd)
@@ -98,6 +101,8 @@ static void *thr_wrapper(void *vtwd)
 
     tsep = twd->tse; /* We aren't allowed to follow twd after
 			result has been set! */
+    if (twd->name)
+        ethr_setname(twd->name);
 
     ethr_atomic32_set(&twd->result, result);
 
@@ -315,6 +320,12 @@ ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
     twd.thr_func = func;
     twd.arg = arg;
 
+    if (opts && opts->name) {
+        snprintf(twd.name_buff, 16, "%s", opts->name);
+	twd.name = twd.name_buff;
+    } else
+        twd.name = NULL;
+
     res = pthread_attr_init(&attr);
     if (res != 0)
 	return res;
@@ -444,6 +455,30 @@ ethr_self(void)
     return (ethr_tid) pthread_self();
 }
 
+int
+ethr_getname(ethr_tid tid, char *buf, size_t len)
+{
+#if defined(ETHR_HAVE_PTHREAD_GETNAME_NP_3)
+    return pthread_getname_np((pthread_t) tid, buf, len);
+#elif defined(ETHR_HAVE_PTHREAD_GETNAME_NP_2)
+    return pthread_getname_np((pthread_t) tid, buf);
+#else
+    return ENOSYS;
+#endif
+}
+
+void
+ethr_setname(char *name)
+{
+#if defined(ETHR_HAVE_PTHREAD_SETNAME_NP_2) 
+    pthread_setname_np(ethr_self(), name);
+#elif defined(ETHR_HAVE_PTHREAD_SET_NAME_NP_2)
+    pthread_set_name_np(ethr_self(), name);
+#elif defined(ETHR_HAVE_PTHREAD_SETNAME_NP_1)
+    pthread_setname_np(name);
+#endif
+}
+
 int
 ethr_equal_tids(ethr_tid tid1, ethr_tid tid2)
 {
diff --git a/erts/lib_src/win/ethread.c b/erts/lib_src/win/ethread.c
index 14d0b6deff..fe5d4a327f 100644
--- a/erts/lib_src/win/ethread.c
+++ b/erts/lib_src/win/ethread.c
@@ -508,6 +508,19 @@ ethr_self(void)
     return *tid;
 }
 
+/* getname and setname are not available on windows */
+int
+ethr_getname(ethr_tid tid, char *buf, size_t len)
+{
+    return ENOSYS;
+}
+
+void
+ethr_setname(char *name)
+{
+    return;
+}
+
 int
 ethr_equal_tids(ethr_tid tid1, ethr_tid tid2)
 {
-- 
cgit v1.2.3


From b8a2313263d0f120dacbe82ced5c99545bbd15a3 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Thu, 4 Dec 2014 11:04:23 +0100
Subject: erts: Introduce thread suspend functions

These functions allow any thread to suspend any other thread
immediately and then resume all threads. This is useful when
doing a crash dump in order to get a more accurate picture
of what state the system is in.
---
 erts/lib_src/pthread/ethread.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'erts/lib_src')

diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c
index 340d085428..7cf38580c5 100644
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
@@ -600,6 +600,17 @@ int ethr_sigwait(const sigset_t *set, int *sig)
     return 0;
 }
 
+int ethr_kill(const ethr_tid tid, const int sig)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+    return pthread_kill((const pthread_t)tid, sig);
+}
+
 #endif /* #if ETHR_HAVE_ETHR_SIG_FUNCS */
 
 ETHR_IMPL_NORETURN__
-- 
cgit v1.2.3