Cleanup: standardise include path

[lttng-ust.git] / liblttng-ust / compat.h

diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h
index 19d4da828b67cc793b056a46933d3b332c74b870..7d1ee590326fd1b9616569420b32846d4e458f7f 100644 (file)
--- a/liblttng-ust/compat.h
+++ b/liblttng-ust/compat.h
@@ -3,6 +3,7 @@
 
 /*
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2016 Raphaël Beamonte <raphael.beamonte@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,17 +20,93 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <sys/syscall.h>
+#include <pthread.h>
 
-#ifdef __UCLIBC__
-#define __getcpu(cpu, node, cache)     syscall(__NR_getcpu, cpu, node, cache)
+/*
+ * Limit imposed by Linux UST-sessiond ABI.
+ */
+#define LTTNG_UST_PROCNAME_LEN 17
+
+#define LTTNG_UST_PROCNAME_SUFFIX "-ust"
+
+
+#if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID)
 static inline
-int sched_getcpu(void)
+int lttng_pthread_setname_np(const char *name)
 {
-       int c, s;
+        return pthread_setname_np(pthread_self(), name);
+}
 
-       s = __getcpu(&c, NULL, NULL);
-       return (s == -1) ? s : c;
+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);
 }
-#endif /* __UCLIBC__ */
+
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+        return pthread_getname_np(name, len);
+}
+#else
+/*
+ * For platforms without thread name support, do nothing.
+ */
+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
+
+static inline
+void lttng_ust_getprocname(char *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;
+       }
+
+       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 */