X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fcompat.h;h=200d9771f85462b91ceabb7b5404254787e25fb9;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=69761880e125fbff0504320697c22203180b7d97;hpb=0db3d6ee9be2906d02955fedee802338bcfaef3a;p=lttng-ust.git diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h index 69761880..200d9771 100644 --- a/liblttng-ust/compat.h +++ b/liblttng-ust/compat.h @@ -1,28 +1,17 @@ -#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 * Copyright (C) 2020 Michael Jeanson - * - * 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 */ +#ifndef _UST_COMPAT_H +#define _UST_COMPAT_H + #include #include +#include #include @@ -33,6 +22,14 @@ static inline int lttng_pthread_setname_np(const char *name) { + /* + * 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); } @@ -59,6 +56,11 @@ int lttng_pthread_getname_np(char *name, size_t len) 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; + } + pthread_set_name_np(pthread_self(), name); return 0; } @@ -77,6 +79,10 @@ int lttng_pthread_getname_np(char *name, size_t len) 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); }