X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fcompat.h;h=003b480aa01d27dc428877dc9935963335e5340d;hb=730be651d21f3950980fd61e1c65953017c6322e;hp=05b85a930615516da7175af84661ce144f7d5127;hpb=48621a4272bdeb1e8fced511ca6bf3c4c2240c15;p=lttng-ust.git

diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h
index 05b85a93..003b480a 100644
--- a/liblttng-ust/compat.h
+++ b/liblttng-ust/compat.h
@@ -2,39 +2,23 @@
 #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.
- */
-
-/*
- * sched_getcpu.
+ * 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
  */
-#ifdef __linux__
-
-#ifdef __UCLIBC__
-#include <sys/syscall.h>
-#define __getcpu(cpu, node, cache)	syscall(__NR_getcpu, cpu, node, cache)
-static inline
-int sched_getcpu(void)
-{
-	int c, s;
-
-	s = __getcpu(&c, NULL, NULL);
-	return (s == -1) ? s : c;
-}
-#endif	/* __UCLIBC__ */
-
-#else
-#error "Please add support for your OS into liblttng-ust/compat.h."
-#endif
 
 /*
  * lttng_ust_getprocname.
@@ -51,7 +35,19 @@ void lttng_ust_getprocname(char *name)
 	(void) prctl(PR_GET_NAME, (unsigned long) name, 0, 0, 0);
 }
 
+/*
+ * If pthread_setname_np is available.
+ */
+#ifdef HAVE_PTHREAD_SETNAME_NP
+static inline
+int lttng_pthread_setname_np(pthread_t thread, const char *name)
+{
+	return pthread_setname_np(thread, name);
+}
+#endif
+
 #elif defined(__FreeBSD__)
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -72,9 +68,69 @@ void lttng_ust_getprocname(char *name)
 	bsd_name = getprogname();
 	if (!bsd_name)
 		name[0] = '\0';
-	memcpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1);
+	else
+		strncpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1);
 }
 
+/*
+ * 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)
+{
+	return pthread_set_name_np(thread, name);
+}
+#endif
+
+#endif
+
+/*
+ * If a pthread setname/set_name function is available, declare
+ * 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;
+
+	lttng_ust_getprocname(name);
+
+	len = strlen(name);
+	if (len > limit) {
+		len = limit;
+	}
+
+	ret = sprintf(name + len, LTTNG_UST_PROCNAME_SUFFIX);
+	if (ret != strlen(LTTNG_UST_PROCNAME_SUFFIX)) {
+		goto error;
+	}
+
+	ret = lttng_pthread_setname_np(pthread_self(), name);
+
+error:
+	return ret;
+}
+#else
+static inline
+int lttng_ust_setustprocname(void)
+{
+	return 0;
+}
+#endif
+
+#include <errno.h>
+
+#ifndef ENODATA
+#define ENODATA	ENOMSG
 #endif
 
 #endif /* _UST_COMPAT_H */