/*
* 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
* 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);
+}
- bsd_name = getprogname();
- if (!bsd_name)
- name[0] = '\0';
- memcpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1);
+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;
}
-#endif
#include <errno.h>