X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Fcompat.h;h=7d1ee590326fd1b9616569420b32846d4e458f7f;hb=d9c56a93651a409c6ceea65ed1d7f33e3f5ee538;hp=37480671052edcb872c58345958b7c543c2ddea4;hpb=05cbbadf100053288c7ceccb1ef4ef6763638aea;p=lttng-ust.git

diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h
index 37480671..7d1ee590 100644
--- a/liblttng-ust/compat.h
+++ b/liblttng-ust/compat.h
@@ -2,57 +2,111 @@
 #define _UST_COMPAT_H
 
 /*
- * Copyright (C) 2011   Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2016 Raphaël Beamonte <raphael.beamonte@gmail.com>
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <pthread.h>
+
 /*
- * lttng_ust_getprocname.
+ * Limit imposed by Linux UST-sessiond ABI.
  */
-#ifdef __linux__
+#define LTTNG_UST_PROCNAME_LEN 17
 
-#include <sys/prctl.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);
+        return pthread_setname_np(pthread_self(), name);
 }
 
-#elif defined(__FreeBSD__)
-#include <stdlib.h>
-#include <string.h>
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+        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);
+}
 
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+        return pthread_getname_np(name, len);
+}
+#else
 /*
- * Limit imposed by Linux UST-sessiond ABI.
+ * For platforms without thread name support, do nothing.
  */
-#define LTTNG_UST_PROCNAME_LEN 17
+static inline
+int lttng_pthread_setname_np(const char *name)
+{
+        return -ENOSYS;
+}
+
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+        return -ENOSYS;
+}
+#endif
 
-/*
- * Acts like linux prctl, the string is not necessarily 0-terminated if
- * 16-byte long.
- */
 static inline
 void lttng_ust_getprocname(char *name)
 {
-	const char *bsd_name;
+	lttng_pthread_getname_np(name, LTTNG_UST_PROCNAME_LEN);
+}
+
+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;
+
+	lttng_pthread_getname_np(name, LTTNG_UST_PROCNAME_LEN);
+
+	len = strlen(name);
+	if (len > limit) {
+		len = limit;
+	}
 
-	bsd_name = getprogname();
-	if (!bsd_name)
-		name[0] = '\0';
-	memcpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1);
+	ret = sprintf(name + len, LTTNG_UST_PROCNAME_SUFFIX);
+	if (ret != strlen(LTTNG_UST_PROCNAME_SUFFIX)) {
+		goto error;
+	}
+
+	ret = lttng_pthread_setname_np(name);
+
+error:
+	return ret;
 }
 
+
+#include <errno.h>
+
+#ifndef ENODATA
+#define ENODATA	ENOMSG
 #endif
 
 #endif /* _UST_COMPAT_H */