mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-12 14:21:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux: Avoid shifting a negative signed on POSIX timer interface

Browse Source 
The current macros uses pid as signed value, which triggers a compiler
warning for process and thread timers.  Replace MAKE_PROCESS_CPUCLOCK
with static inline function that expects the pid as unsigned.  These
are similar to what Linux does internally.

Checked on x86_64-linux-gnu.
Reviewed-by: Arjun Shankar <arjun@redhat.com>
This commit is contained in:
Adhemerval Zanella 2022-08-30 09:08:02 -03:00
parent 643a2d0139
commit 9b5e138f2b
5 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nptl/pthread_getcpuclockid.c
View File

@ -35,7 +35,7 @@ __pthread_getcpuclockid (pthread_t threadid, clockid_t *clockid)
/* The clockid_t value is a simple computation from the TID. */
const clockid_t tidclock = MAKE_THREAD_CPUCLOCK (pd->tid, CPUCLOCK_SCHED);
const clockid_t tidclock = make_thread_cpuclock (pd->tid, CPUCLOCK_SCHED);
*clockid = tidclock;
return 0;

2
sysdeps/unix/sysv/linux/clock_getcpuclockid.c
View File

@ -29,7 +29,7 @@ __clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
/* The clockid_t value is a simple computation from the PID.
But we do a clock_getres call to validate it. */
const clockid_t pidclock = MAKE_PROCESS_CPUCLOCK (pid, CPUCLOCK_SCHED);
const clockid_t pidclock = make_process_cpuclock (pid, CPUCLOCK_SCHED);
#ifndef __NR_clock_getres_time64
# define __NR_clock_getres_time64 __NR_clock_getres

2
sysdeps/unix/sysv/linux/clock_nanosleep.c
View File

@ -34,7 +34,7 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags,
if (clock_id == CLOCK_THREAD_CPUTIME_ID)
return EINVAL;
if (clock_id == CLOCK_PROCESS_CPUTIME_ID)
clock_id = MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED);
clock_id = PROCESS_CLOCK;
/* If the call is interrupted by a signal handler or encounters an error,
it returns a positive value similar to errno. */

28
sysdeps/unix/sysv/linux/kernel-posix-cpu-timers.h
View File

@ -1,4 +1,12 @@
/* Parameters for the Linux kernel ABI for CPU clocks. */
/*
Parameters for the Linux kernel ABI for CPU clocks, the bit fields within
a clockid:
- The most significant 29 bits hold either a pid or a file descriptor.
- Bit 2 indicates whether a cpu clock refers to a thread or a process.
- Bits 1 and 0 give the type: PROF=0, VIRT=1, SCHED=2, or FD=3.
- A clockid is invalid if bits 2, 1, and 0 are all set.
*/
#define CPUCLOCK_PID(clock) ((pid_t) ~((clock) >> 3))
#define CPUCLOCK_PERTHREAD(clock) \
@ -12,7 +20,17 @@
#define CPUCLOCK_SCHED 2
#define CPUCLOCK_MAX 3
#define MAKE_PROCESS_CPUCLOCK(pid, clock) \
((~(clockid_t) (pid) << 3) | (clockid_t) (clock))
#define MAKE_THREAD_CPUCLOCK(tid, clock) \
MAKE_PROCESS_CPUCLOCK((tid), (clock) | CPUCLOCK_PERTHREAD_MASK)
static inline clockid_t
make_process_cpuclock (unsigned int pid, clockid_t clock)
{
return ((~pid) << 3) | clock;
}
static inline clockid_t
make_thread_cpuclock (unsigned int tid, clockid_t clock)
{
return make_process_cpuclock (tid, clock | CPUCLOCK_PERTHREAD_MASK);
}
#define PROCESS_CLOCK make_process_cpuclock (0, CPUCLOCK_SCHED)
#define THREAD_CLOCK make_thread_cpuclock (0, CPUCLOCK_SCHED)

4
sysdeps/unix/sysv/linux/timer_create.c
View File

@ -33,9 +33,9 @@ ___timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid)
{
{
clockid_t syscall_clockid = (clock_id == CLOCK_PROCESS_CPUTIME_ID
? MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED)
? PROCESS_CLOCK
: clock_id == CLOCK_THREAD_CPUTIME_ID
? MAKE_THREAD_CPUCLOCK (0, CPUCLOCK_SCHED)
? THREAD_CLOCK
: clock_id);
/* If the user wants notification via a thread we need to handle