X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fcompat.h;h=7f0f5027ba6c9a619912fdef33cd866954b19f96;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=cd83b46ba8e4000dc901f2e5adddca8debf59977;hpb=ffaea23347a6aa8f2d7c311e5d4feb7a891be182;p=lttng-ust.git diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h index cd83b46b..7f0f5027 100644 --- a/liblttng-ust/compat.h +++ b/liblttng-ust/compat.h @@ -1,88 +1,112 @@ -#ifndef _UST_COMPAT_H -#define _UST_COMPAT_H - /* + * SPDX-License-Identifier: LGPL-2.1-only + * * Copyright (C) 2011 Mathieu Desnoyers * Copyright (C) 2016 Raphaël Beamonte - * - * 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. - * - * 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 + * Copyright (C) 2020 Michael Jeanson */ -/* - * lttng_ust_getprocname. - */ -#ifdef __linux__ +#ifndef _UST_COMPAT_H +#define _UST_COMPAT_H -#include +#include +#include +#include + +#ifdef __FreeBSD__ +#include +#endif + +#include + +#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); + /* + * Some implementations don't error out, replicate this behavior for + * consistency. + */ + if (strnlen(name, LTTNG_UST_ABI_PROCNAME_LEN) >= LTTNG_UST_ABI_PROCNAME_LEN) { + return ERANGE; + } + + return pthread_setname_np(pthread_self(), name); } +#elif defined(HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID) +static inline +int lttng_pthread_setname_np(const char *name) +{ + return pthread_setname_np(name); +} +#elif defined(HAVE_PTHREAD_SET_NAME_NP_WITH_TID) -/* - * If pthread_setname_np is available. - */ -#ifdef HAVE_PTHREAD_SETNAME_NP static inline -int lttng_pthread_setname_np(pthread_t thread, const char *name) +int lttng_pthread_setname_np(const char *name) { - return pthread_setname_np(thread, name); + /* Replicate pthread_setname_np's behavior */ + if (strnlen(name, LTTNG_UST_ABI_PROCNAME_LEN) >= LTTNG_UST_ABI_PROCNAME_LEN) { + return ERANGE; + } + + pthread_set_name_np(pthread_self(), name); + return 0; } -#endif +#elif defined(__linux__) -#elif defined(__FreeBSD__) +/* Fallback on prtctl on Linux */ +#include -#include -#include +static inline +int lttng_pthread_setname_np(const char *name) +{ + /* Replicate pthread_setname_np's behavior */ + if (strnlen(name, LTTNG_UST_ABI_PROCNAME_LEN) >= LTTNG_UST_ABI_PROCNAME_LEN) { + return ERANGE; + } + return prctl(PR_SET_NAME, name, 0, 0, 0); +} +#else +#error "Please add pthread set name support for your OS." +#endif -/* - * Limit imposed by Linux UST-sessiond ABI. - */ -#define LTTNG_UST_PROCNAME_LEN 17 -/* - * Acts like linux prctl, the string is not necessarily 0-terminated if - * 16-byte long. - */ +#if defined(HAVE_PTHREAD_GETNAME_NP_WITH_TID) +static inline +int lttng_pthread_getname_np(char *name, size_t len) +{ + return pthread_getname_np(pthread_self(), name, len); +} +#elif defined(HAVE_PTHREAD_GETNAME_NP_WITHOUT_TID) static inline -void lttng_ust_getprocname(char *name) +int lttng_pthread_getname_np(char *name, size_t len) { - const char *bsd_name; + return pthread_getname_np(name, len); +} +#elif defined(HAVE_PTHREAD_GET_NAME_NP_WITH_TID) - bsd_name = getprogname(); - if (!bsd_name) - name[0] = '\0'; - else - strncpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1); +static inline +int lttng_pthread_getname_np(char *name, size_t len) +{ + pthread_get_name_np(pthread_self(), name, len); + return 0; } +#elif defined(__linux__) + +/* Fallback on prtctl on Linux */ +#include -/* - * 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) +int lttng_pthread_getname_np(char *name, size_t len) { - return pthread_set_name_np(thread, name); + return prctl(PR_GET_NAME, name, 0, 0, 0); } -#endif +#else +#error "Please add pthread get name support for your OS." #endif /* @@ -90,19 +114,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. */ -#if defined(HAVE_PTHREAD_SETNAME_NP) || defined(HAVE_PTHREAD_SETNAME_NP) -#define LTTNG_UST_PROCNAME_SUFFIX "-ust" - -#include - 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; + char name[LTTNG_UST_ABI_PROCNAME_LEN]; + int limit = LTTNG_UST_ABI_PROCNAME_LEN - strlen(LTTNG_UST_PROCNAME_SUFFIX) - 1; - lttng_ust_getprocname(name); + /* + * 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) { @@ -110,22 +135,15 @@ int lttng_ust_setustprocname(void) } ret = sprintf(name + len, LTTNG_UST_PROCNAME_SUFFIX); - if (ret) { + if (ret != strlen(LTTNG_UST_PROCNAME_SUFFIX)) { goto error; } - ret = lttng_pthread_setname_np(pthread_self(), name); + ret = lttng_pthread_setname_np(name); error: return ret; } -#else -static inline -int lttng_ust_setustprocname(void) -{ - return 0; -} -#endif #include