mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-21 00:50:04 +00:00
c362135134
nice (XPG3) calls getpriority and setpriority (in XPG4 but not XPG3, i.e. UX-shaded in XPG4). This patch fixes this by making those functions into weak aliases of __* functions and calling the __* versions as needed. Tested for x86_64 and x86 (testsuite, and that disassembly of installed shared libraries is unchanged by this patch). This completes cleaning up the unsorted linknamespace test XFAILs. [BZ #18553] * resource/getpriority.c (getpriority): Rename to __getpriority and define as weak alias of __getpriority. * resource/setpriority.c (setpriority): Rename to __setpriority and define as weak alias of __setpriority. * sysdeps/mach/hurd/getpriority.c (getpriority): Rename to __getpriority and define as weak alias of __getpriority. * sysdeps/mach/hurd/setpriority.c (setpriority): Rename to __setpriority and define as weak alias of __setpriority. * sysdeps/unix/syscalls.list (getpriority): Use __getpriority as strong name. (setpriority): Use __setpriority as strong name. * sysdeps/unix/sysv/linux/getpriority.c (getpriority): Rename to __getpriority and define as weak alias of __getpriority. * include/sys/resource.h (__getpriority): Declare. Use libc_hidden_proto. (__setpriority): Likewise. (getpriority): Don't use libc_hidden_proto. (setpriority): Likewise. * sysdeps/posix/nice.c (nice): Call __getpriority instead of getpriority. Call __setpriority instead of setpriority. * conform/Makefile (test-xfail-XPG3/unistd.h/linknamespace): Remove variable.
52 lines
1.5 KiB
C
52 lines
1.5 KiB
C
/* Copyright (C) 1992-2015 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; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <sys/resource.h>
|
|
|
|
/* Increment the scheduling priority of the calling process by INCR.
|
|
The superuser may use a negative INCR to decrement the priority. */
|
|
int
|
|
nice (int incr)
|
|
{
|
|
int save;
|
|
int prio;
|
|
int result;
|
|
|
|
/* -1 is a valid priority, so we use errno to check for an error. */
|
|
save = errno;
|
|
__set_errno (0);
|
|
prio = __getpriority (PRIO_PROCESS, 0);
|
|
if (prio == -1)
|
|
{
|
|
if (errno != 0)
|
|
return -1;
|
|
else
|
|
__set_errno (save);
|
|
}
|
|
|
|
result = __setpriority (PRIO_PROCESS, 0, prio + incr);
|
|
if (result == -1)
|
|
{
|
|
if (errno == EACCES)
|
|
errno = EPERM;
|
|
return -1;
|
|
}
|
|
return __getpriority (PRIO_PROCESS, 0);
|
|
}
|