posix-cpu-clocks: cleanup clock macros
PATCH 1/1 posix-cpu-clocks: cleanup clock macros
These macros were a little confused looking, so I cleaned then up a bit. I think this way it's a little clearer what's what ..
Signed-off-by Daniel Walker <[email protected]>
--- include/linux/posix-timers.h | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-)
include/linux/posix-timers.h +27 -11
@@ -17,22 +17,38 @@ struct cpu_timer_list {int firing; }; -#define CPUCLOCK_PID (clock) ((pid_t) ~((clock) >> 3)) -#define CPUCLOCK_PERTHREAD (clock) \ - (((clock) & (clockid_t) CPUCLOCK_PERTHREAD_MASK) != 0) -#define CPUCLOCK_PID_MASK 7 -#define CPUCLOCK_PERTHREAD_MASK 4 + +/* +* CPU Clock types +*/ +#define CPUCLOCK_PROF 0x0 +#define CPUCLOCK_VIRT 0x1 +#define CPUCLOCK_SCHED 0x2 +#define CPUCLOCK_MAX 0x3 + +#define CPUCLOCK_CLOCK_MASK (CPUCLOCK_SCHED | CPUCLOCK_VIRT | CPUCLOCK_PROF) +#define CPUCLOCK_WHICH (clock) ((clock) & (clockid_t) CPUCLOCK_CLOCK_MASK) -#define CPUCLOCK_CLOCK_MASK 3 -#define CPUCLOCK_PROF 0 -#define CPUCLOCK_VIRT 1 -#define CPUCLOCK_SCHED 2 -#define CPUCLOCK_MAX 3 + +/* +* Per thread flag +*/ +#define CPUCLOCK_PERTHREAD_FLAG 0x4 +#define CPUCLOCK_PERTHREAD (clock) \ + (((clock) & (clockid_t) CPUCLOCK_PERTHREAD_FLAG) != 0) + +/* +* Bits used for the PID within the clockid +*/ +#define CPUCLOCK_PID_MASK 0x7 +#define CPUCLOCK_PID (clock) ((pid_t) ~((clock) >> 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) + MAKE_PROCESS_CPUCLOCK((tid), (clock) | CPUCLOCK_PERTHREAD_FLAG) +/* POSIX.1b interval timer structure. */ struct k_itimer {
Signature · 1 line
--