projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
port: fix pthread_setname_np integration
[lttng-ust.git]
/
liblttng-ust
/
compat.h
diff --git
a/liblttng-ust/compat.h
b/liblttng-ust/compat.h
index 003b480aa01d27dc428877dc9935963335e5340d..69761880e125fbff0504320697c22203180b7d97 100644
(file)
--- 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) 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
*
* 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,73
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/*
- * lttng_ust_getprocname.
- */
-#ifdef __linux__
+#include <pthread.h>
+#include <errno.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
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
);
}
}
-/*
- * If pthread_setname_np is available.
- */
-#ifdef HAVE_PTHREAD_SETNAME_NP
static inline
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__)
-#include <stdlib.h>
-#include <string.h>
+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)
-/*
- * Limit imposed by Linux UST-sessiond ABI.
- */
-#define LTTNG_UST_PROCNAME_LEN 17
+#include <pthread_np.h>
+static inline
+int lttng_pthread_setname_np(const char *name)
+{
+ 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
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__)
+
+/* Fallback on prtctl on Linux */
+#include <sys/prctl.h>
- bsd_name = getprogname();
- if (!bsd_name)
- name[0] = '\0';
- else
- strncpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1);
+static inline
+int lttng_pthread_setname_np(const char *name)
+{
+ return prctl(PR_SET_NAME, name, 0, 0, 0);
}
}
-/*
- * If pthread_set_name_np is available.
- */
-#ifdef HAVE_PTHREAD_SET_NAME_NP
static inline
static inline
-int lttng_pthread_
setname_np(pthread_t thread, const char *name
)
+int lttng_pthread_
getname_np(char *name, size_t len
)
{
{
- return p
thread_set_name_np(thread, name
);
+ return p
rctl(PR_GET_NAME, name, 0, 0, 0
);
}
}
-#endif
+#else
+#error "Please add pthread name support for your OS."
#endif
/*
#endif
/*
@@
-90,19
+95,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.
*/
* 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;
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);
+ char name[LTTNG_UST_ABI_PROCNAME_LEN];
+ int limit = LTTNG_UST_ABI_PROCNAME_LEN - strlen(LTTNG_UST_PROCNAME_SUFFIX) - 1;
+
+ /*
+ * 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) {
len = strlen(name);
if (len > limit) {
@@
-114,18
+120,11
@@
int lttng_ust_setustprocname(void)
goto error;
}
goto error;
}
- ret = lttng_pthread_setname_np(
pthread_self(),
name);
+ ret = lttng_pthread_setname_np(name);
error:
return ret;
}
error:
return ret;
}
-#else
-static inline
-int lttng_ust_setustprocname(void)
-{
- return 0;
-}
-#endif
#include <errno.h>
#include <errno.h>
This page took
0.040798 seconds
and
4
git commands to generate.