mirror of
https://sourceware.org/git/glibc.git
synced 2025-04-26 15:09:05 +03:00
This patch consolidates all the non cancellable read calls to use the __read_nocancel identifier. For non cancellable targets it will be just a macro to call the default respective symbol while on Linux will be a internal one. Also, since it is used on libcrypto it is also exported in GLIBC_PRIVATE namespace. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * sysdeps/generic/not-cancel.h (read_not_cancel): Remove macro. (__read_nocancel): New macro. * sysdeps/unix/sysv/linux/Versions (libc) [GLIBC_PRIVATE]: Add __read_nocancel. * sysdeps/unix/sysv/linux/not-cancel.h (__read_nocancel): Remove macro. (__read_nocancel): New prototype. * sysdeps/unix/sysv/linux/read.c (__read_nocancel): New function. * catgets/open_catalog.c (__open_catalog): Replace read_not_cancel with __read_nocancel. * intl/loadmsgcat.c (read): Likewise. * libio/fileops.c (_IO_file_read): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * login/utmp_file.c (getutent_r_file): Likewise. (internal_getut_r): Likewise. (getutline_r_file): Likewise. * sysdeps/unix/sysv/linux/fips-private.h (fips_enable_p): Likewise. * sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise. * sysdeps/unix/sysv/linux/getloadavg.c (getloadavg): Likewise. * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (next_line): Likewise. * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise. * sysdeps/unix/sysv/linux/ia64/has_cpuclock.c (has_cpuclock): Likewise. * sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps): Likewise. * sysdeps/unix/sysv/linux/malloc-sysdep.h (check_may_shrink_heap): Likewise. * sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np): Likewise. * sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
70 lines
1.9 KiB
C
70 lines
1.9 KiB
C
/* pthread_getname_np -- Get thread name. Linux version
|
|
Copyright (C) 2010-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C 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; either version 2.1 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C 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 the GNU C Library; see the file COPYING.LIB. If
|
|
not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <pthreadP.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/prctl.h>
|
|
|
|
#include <not-cancel.h>
|
|
|
|
|
|
int
|
|
pthread_getname_np (pthread_t th, char *buf, size_t len)
|
|
{
|
|
const struct pthread *pd = (const struct pthread *) th;
|
|
|
|
/* Unfortunately the kernel headers do not export the TASK_COMM_LEN
|
|
macro. So we have to define it here. */
|
|
#define TASK_COMM_LEN 16
|
|
if (len < TASK_COMM_LEN)
|
|
return ERANGE;
|
|
|
|
if (pd == THREAD_SELF)
|
|
return prctl (PR_GET_NAME, buf) ? errno : 0;
|
|
|
|
#define FMT "/proc/self/task/%u/comm"
|
|
char fname[sizeof (FMT) + 8];
|
|
sprintf (fname, FMT, (unsigned int) pd->tid);
|
|
|
|
int fd = __open_nocancel (fname, O_RDONLY);
|
|
if (fd == -1)
|
|
return errno;
|
|
|
|
int res = 0;
|
|
ssize_t n = TEMP_FAILURE_RETRY (__read_nocancel (fd, buf, len));
|
|
if (n < 0)
|
|
res = errno;
|
|
else
|
|
{
|
|
if (buf[n - 1] == '\n')
|
|
buf[n - 1] = '\0';
|
|
else if (n == len)
|
|
res = ERANGE;
|
|
else
|
|
buf[n] = '\0';
|
|
}
|
|
|
|
close_not_cancel_no_status (fd);
|
|
|
|
return res;
|
|
}
|