X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fcompat.h;h=e1f5f8b3f8ed5aeec2bd57f99df458ddf2bf0332;hb=9f47aac89a87197f5f1ea18acdc160087ac58397;hp=cd83b46ba8e4000dc901f2e5adddca8debf59977;hpb=ffaea23347a6aa8f2d7c311e5d4feb7a891be182;p=lttng-ust.git

diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h
index cd83b46b..e1f5f8b3 100644
--- a/liblttng-ust/compat.h
+++ b/liblttng-ust/compat.h
@@ -4,6 +4,7 @@
 /*
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2016 Raphaël Beamonte <raphael.beamonte@gmail.com>
+ * Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,69 +21,91 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/*
- * lttng_ust_getprocname.
- */
-#ifdef __linux__
+#include <pthread.h>
+#include <errno.h>
+#include <string.h>
 
-#include <sys/prctl.h>
+#include <lttng/ust-abi.h>
+
+#define LTTNG_UST_PROCNAME_SUFFIX "-ust"
 
-#define LTTNG_UST_PROCNAME_LEN 17
 
+#if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID)
 static inline
-void lttng_ust_getprocname(char *name)
+int lttng_pthread_setname_np(const char *name)
 {
-	(void) prctl(PR_GET_NAME, (unsigned long) name, 0, 0, 0);
+	/*
+	 * Some implementations don't error out, replicate this behavior for
+	 * consistency.
+	 */
+	if (strnlen(name, LTTNG_UST_ABI_PROCNAME_LEN) >= LTTNG_UST_ABI_PROCNAME_LEN) {
+		return ERANGE;
+	}
+
+	return pthread_setname_np(pthread_self(), name);
 }
 
-/*
- * If pthread_setname_np is available.
- */
-#ifdef HAVE_PTHREAD_SETNAME_NP
 static inline
-int lttng_pthread_setname_np(pthread_t thread, const char *name)
+int lttng_pthread_getname_np(char *name, size_t len)
 {
-	return pthread_setname_np(thread, name);
+	return pthread_getname_np(pthread_self(), name, len);
+}
+#elif defined(HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID)
+static inline
+int lttng_pthread_setname_np(const char *name)
+{
+	return pthread_setname_np(name);
 }
-#endif
 
-#elif defined(__FreeBSD__)
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+	return pthread_getname_np(name, len);
+}
+#elif defined(HAVE_PTHREAD_SET_NAME_NP_WITH_TID)
 
-#include <stdlib.h>
-#include <string.h>
+#include <pthread_np.h>
+static inline
+int lttng_pthread_setname_np(const char *name)
+{
+	/* Replicate pthread_setname_np's behavior */
+	if (strnlen(name, LTTNG_UST_ABI_PROCNAME_LEN) >= LTTNG_UST_ABI_PROCNAME_LEN) {
+		return ERANGE;
+	}
 
-/*
- * Limit imposed by Linux UST-sessiond ABI.
- */
-#define LTTNG_UST_PROCNAME_LEN 17
+	pthread_set_name_np(pthread_self(), name);
+	return 0;
+}
 
-/*
- * Acts like linux prctl, the string is not necessarily 0-terminated if
- * 16-byte long.
- */
 static inline
-void lttng_ust_getprocname(char *name)
+int lttng_pthread_getname_np(char *name, size_t len)
 {
-	const char *bsd_name;
+	pthread_get_name_np(pthread_self(), name, len);
+	return 0;
+}
+#elif defined(__linux__)
 
-	bsd_name = getprogname();
-	if (!bsd_name)
-		name[0] = '\0';
-	else
-		strncpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1);
+/* Fallback on prtctl on Linux */
+#include <sys/prctl.h>
+
+static inline
+int lttng_pthread_setname_np(const char *name)
+{
+	/* Replicate pthread_setname_np's behavior */
+	if (strnlen(name, LTTNG_UST_ABI_PROCNAME_LEN) >= LTTNG_UST_ABI_PROCNAME_LEN) {
+		return ERANGE;
+	}
+	return prctl(PR_SET_NAME, name, 0, 0, 0);
 }
 
-/*
- * If pthread_set_name_np is available.
- */
-#ifdef HAVE_PTHREAD_SET_NAME_NP
 static inline
-int lttng_pthread_setname_np(pthread_t thread, const char *name)
+int lttng_pthread_getname_np(char *name, size_t len)
 {
-	return pthread_set_name_np(thread, name);
+	return prctl(PR_GET_NAME, name, 0, 0, 0);
 }
-#endif
 
+#else
+#error "Please add pthread name support for your OS."
 #endif
 
 /*
@@ -90,19 +113,20 @@ int lttng_pthread_setname_np(pthread_t thread, const char *name)
  * the setustprocname() function that will add '-ust' to the end
  * of the current process name, while truncating it if needed.
  */
-#if defined(HAVE_PTHREAD_SETNAME_NP) || defined(HAVE_PTHREAD_SETNAME_NP)
-#define LTTNG_UST_PROCNAME_SUFFIX "-ust"
-
-#include <pthread.h>
-
 static inline
 int lttng_ust_setustprocname(void)
 {
 	int ret = 0, len;
-	char name[LTTNG_UST_PROCNAME_LEN];
-	int limit = LTTNG_UST_PROCNAME_LEN - strlen(LTTNG_UST_PROCNAME_SUFFIX) - 1;
+	char name[LTTNG_UST_ABI_PROCNAME_LEN];
+	int limit = LTTNG_UST_ABI_PROCNAME_LEN - strlen(LTTNG_UST_PROCNAME_SUFFIX) - 1;
 
-	lttng_ust_getprocname(name);
+	/*
+	 * Get the current thread name.
+	 */
+	ret = lttng_pthread_getname_np(name, LTTNG_UST_ABI_PROCNAME_LEN);
+	if (ret) {
+		goto error;
+	}
 
 	len = strlen(name);
 	if (len > limit) {
@@ -110,22 +134,15 @@ int lttng_ust_setustprocname(void)
 	}
 
 	ret = sprintf(name + len, LTTNG_UST_PROCNAME_SUFFIX);
-	if (ret) {
+	if (ret != strlen(LTTNG_UST_PROCNAME_SUFFIX)) {
 		goto error;
 	}
 
-	ret = lttng_pthread_setname_np(pthread_self(), name);
+	ret = lttng_pthread_setname_np(name);
 
 error:
 	return ret;
 }
-#else
-static inline
-int lttng_ust_setustprocname(void)
-{
-	return 0;
-}
-#endif
 
 #include <errno.h>