POSIX clocks & timers take 15 (NOT HIGH RES)
Subsystems (8)
PATCH 1/1 POSIX clocks & timers take 15 (NOT HIGH RES)
Randy pointed out that I had attached the wrong file to this message. This is the correct one. I don't think it will apply to the current BK, but just to set the record straight...
I will have a new one as soon as we iron out the nano_sleep regs issue.
Have a nice turkey day :)
This patch has no configure options!
With this version I have changed the signal/ repeating timer model to avoid timer storms from repeating timers. The timer is not inserted back into the timer_list until the signal is dequeued by the receiving task. So, once a timer expires, it will cause NO further system overhead until the task takes the signal, regardless of the repeat interval. The POSIX standard allows this, (actually it seems to encourage it). Each timer has an "overrun" counter that keeps track of the number of times the signal should have been generated but was not because the prior signal was not yet picked up.
The timer_gettime() call returns the time as if the timer were in the timer_list so to the program it looks like it is, but the system overhead is nil.
The really nice thing about this way of limiting timer storms is that a really fast real time program can actually get the high turn over rate while not being impacted by slower, or blocked programs trying to do the same thing. Like wise, if a program loses the cpu, its timers will not impact other tasks. Many thanks to Mark Salisbury <[email protected]> for suggesting this.
The patch stands alone (i.e. does not require any of the following high-res patches).
This, patch implements the POSIX clocks and timers functions. The two standard clocks are defined(CLOCK_REALTIME & CLOCK_MONOTONIC).
Nano_sleep() is rolled into clock_nanosleep(). Also a bug fix in clock_nanosleep().
kernel/timer.c is modified to remove the timer_t typedef which conflicts with the POSIX standard definition for this type.
The patch introduces a new kernel source (posix-timers.c) which contains most of the code.
This implementation has no limits on the number of timers in the system or per process or task, thanks to Jim Houston.
Kernel version 2.5.50
Test programs, man pages and readme files as well as this patch are available on the sourceforge high-res-timers site:
http://sourceforge.net/projects/high-res-timers/
Please apply.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/kernel/entry.S +14 -8
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -239,7 +238,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -315,7 +314,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -769,8 +768,15 @@ .long sys_epoll_wait .long sys_remap_file_pages .long sys_set_tid_address - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create + .long sys_timer_settime /* 260 */ + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime + .long sys_clock_gettime /* 265 */ + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -132,6 +132,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -779,6 +779,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +76 -0
91 lines not on this page · raw message
include/asm-i386/unistd.h +9 -0
@@ -263,6 +263,15 @@#define __NR_sys_epoll_wait 256#define __NR_remap_file_pages 257#define __NR_set_tid_address 258 +#define __NR_timer_create 259 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/id_reuse.h +119 -0
119 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +29 -0
@@ -0,0 +1,29 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int ( *clock_set)(struct timespec *tp); +int ( *clock_get)(struct timespec *tp); +int ( *nsleep)(int flags, +struct timespec *new_setting, +struct itimerspec *old_setting); +int ( *timer_set)(struct k_itimer *timr,int flags, +struct itimerspec *new_setting, +struct itimerspec *old_setting); +int ( *timer_del)(struct k_itimer *timr); +void ( *timer_get)(struct k_itimer *timr, +struct itimerspec *cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -277,6 +277,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -340,6 +359,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -582,6 +602,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +30 -0
@@ -224,6 +224,36 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif +/* +* We would like the asm/signal.h code to define these so that the using +* function can call do_signal(). In loo of that, we define a genaric +* version that pretends that do_signal() was called and delivered a signal. +* To see how this is used, see nano_sleep() in timer.c and the i386 version +* in asm_i386/signal.h. +*/ +#ifndef PT_REGS_ENTRY +#define PT_REGS_ENTRY (type,name,p1_type,p1, p2_type,p2) \ +type name(p1_type p1,p2_type p2)\ +{ +#endif +#ifndef _do_signal +#define _do_signal () 1 +#endif +#ifndef NANOSLEEP_ENTRY +#define NANOSLEEP_ENTRY (a) asmlinkage long sys_nanosleep( struct timespec* rqtp, \ + struct timespec * rmtp) \ +{ a +#endif +#ifndef CLOCK_NANOSLEEP_ENTRY +#define CLOCK_NANOSLEEP_ENTRY (a) asmlinkage long sys_clock_nanosleep( \ + clockid_t which_clock, \ + int flags, \ + const struct timespec *rqtp, \ + struct timespec *rmtp) \ +{ a + +#endif +#endif /* __KERNEL__ */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set #endif #define FD_SETSIZE __FD_SETSIZE
@@ -163,5 +178,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -23,6 +23,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +1 -1
@@ -10,7 +10,7 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \ - rcupdate.o intermodule.o extable.o + rcupdate.o intermodule.o extable.o posix-timers.o id_reuse.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -660,6 +661,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -812,6 +812,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/id_reuse.c +198 -0
198 lines not on this page · raw message
kernel/posix-timers.c +1238 -0
1,238 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -750,6 +765,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1464,8 +1485,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +41 -17
154 lines not on this page · raw message
Ok, finally starting to look at merging this, however:
This must go (we already have a timespec, there's no way it should be here in <asm/signal.h>):
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+ time_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+};
+#endif /* _STRUCT_TIMESPEC */and you have things like
+ if ((flags & TIMER_ABSTIME) &&
+ (clock->clock_get != do_posix_clock_monotonic_gettime)) {
+ }else{
+ }
and
+if (!p) {
+printk("in sub_remove for id=%d called with null pointer.\n", id);
+return(0);
+}and obviously the "nanosleep()" thing and the CLOCK_NANOSLEEP_ENTRY() stuff has been discussed in the unrelated thread (ie it doesn't work for alpha or other architectures).
Linus
On Thu, 5 Dec 2002, Linus Torvalds wrote:
| Ok, finally starting to look at merging this, however:
I'm not too fond of changing NR_syscalls to the computed nr_syscalls, or rather, not in this same patch.
IOW, it should be a separate patch IMO.
Signature · 1 line
~Randy
Quoted 6 lines · Linus Torvalds
Ok, finally starting to look at merging this, however:
This must go (we already have a timespec, there's no way it should be here in <
asm/signal.h>):
Quoted 7 lines
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+ time_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+};
+#endif /* _STRUCT_TIMESPEC */OK.
Quoted 7 lines
and you have things like
+ if ((flags &
TIMER_ABSTIME) &&
+ (clock->clock_get!=do_posix_clock_monotonic_gettime)) {
+ }else{
+ }
A hang over from the high res code, I will remove the empty else.
Quoted 7 lines
and
+if (!p) { +printk("in sub_remove for id=%d called with null pointer.\n", id); +return(0); +}
That is in there!? I will check into and fix it.
Quoted 4 lines
and obviously the "
nanosleep()" thing and theCLOCK_NANOSLEEP_ENTRY()stuff has been discussed in the unrelated thread (ie it doesn't work for alpha or other architectures).
Right! I am merging this now.
I think something went into bk5 yesterday that will require an update. I will update to 2.5.50-bk5 with the above fixes and sent it ... soon.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
All the requested changes and Lindent too :).
I also broke clock_nanosleep() apart much the same way nanosleep() was with the bk5 changes.
George
Quoted 6 lines · Linus Torvalds
Ok, finally starting to look at merging this, however:
This must go (we already have a timespec, there's no way it should be here in <
asm/signal.h>):
Quoted 7 lines
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+ time_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+};
+#endif /* _STRUCT_TIMESPEC */OK.
Quoted 7 lines
and you have things like
+ if ((flags &
TIMER_ABSTIME) &&
+ (clock->clock_get!=do_posix_clock_monotonic_gettime)) {
+ }else{
+ }
A hang over from the high res code, I will remove the empty else.
Quoted 7 lines
and
+if (!p) { +printk("in sub_remove for id=%d called with null pointer.\n", id); +return(0); +}
That is in there!? I will check into and fix it.
Quoted 4 lines
and obviously the "
nanosleep()" thing and theCLOCK_NANOSLEEP_ENTRY()stuff has been discussed in the unrelated thread (ie it doesn't work for alpha or other architectures).
Right! I am merging this now.
I think something went into bk5 yesterday that will require an update. I will update to 2.5.50-bk5 with the above fixes and sent it ... soon.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/kernel/entry.S +14 -8
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -239,7 +238,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -315,7 +314,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -770,8 +769,15 @@ .long sys_remap_file_pages .long sys_set_tid_address .long sys_restart_syscall - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create /* 260 */ + .long sys_timer_settime + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime /* 265 */ + .long sys_clock_gettime + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -132,6 +132,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -779,6 +779,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/linkage.h> +#include <linux/time.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-i386/unistd.h +9 -0
@@ -264,6 +264,15 @@#define __NR_remap_file_pages 257#define __NR_set_tid_address 258#define __NR_restart_syscall 259 +#define __NR_timer_create 260 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/id_reuse.h +119 -0
119 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +30 -0
@@ -0,0 +1,30 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int (*clock_set) (struct timespec * tp); +int (*clock_get) (struct timespec * tp); +int (*nsleep) (int flags, +struct timespec * new_setting, +struct itimerspec * old_setting); +int (*timer_set) (struct k_itimer * timr,int flags, +struct itimerspec * new_setting, +struct itimerspec * old_setting); +int (*timer_del) (struct k_itimer * timr); +void (*timer_get) (struct k_itimer * timr, +struct itimerspec * cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; + +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -276,6 +276,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -339,6 +358,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -579,6 +599,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +1 -1
@@ -225,7 +225,7 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif - +#define FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set extern long do_nanosleep (struct timespec *t);extern long do_utimes (char * filename,struct timeval * times);#endif
@@ -165,5 +180,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -23,6 +23,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +1 -1
@@ -10,7 +10,7 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \ - rcupdate.o intermodule.o extable.o + rcupdate.o intermodule.o extable.o posix-timers.o id_reuse.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -659,6 +660,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -810,6 +810,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/id_reuse.c +194 -0
194 lines not on this page · raw message
kernel/posix-timers.c +1325 -0
1,325 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -751,6 +766,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1478,8 +1499,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +17 -14
@@ -48,12 +48,11 @@struct list_head vec[TVR_SIZE ]; } tvec_root_t; -typedef struct timer_list timer_t ;struct tvec_t_base_s {spinlock_t lock;unsigned long timer_jiffies; -timer_t *running_timer; +struct timer_list *running_timer;tvec_root_t tv1;tvec_t tv2;tvec_t tv3;
@@ -66,7 +65,7 @@/* Fake initialization */ static DEFINE_PER_CPU(tvec_base_t, tvec_bases) = { SPIN_LOCK_UNLOCKED }; -static void check_timer_failed (timer_t *timer) +static void check_timer_failed (struct timer_list *timer) {static int whine_count;if (whine_count <16 ) {
@@ -84,13 +83,13 @@ timer->magic =TIMER_MAGIC ; } -static inline void check_timer (timer_t *timer) +static inline void check_timer (struct timer_list *timer) {if (timer->magic !=TIMER_MAGIC )check_timer_failed (timer); } -static inline void internal_add_timer (tvec_base_t *base,timer_t *timer) +static inline void internal_add_timer (tvec_base_t *base,struct timer_list *timer) {unsigned long expires = timer->expires;unsigned long idx = expires - base->timer_jiffies;
@@ -142,7 +141,7 @@* Timers with an ->expired field in the past will be executed in the next * timer tick. It's illegal to add an already pending timer. */ -void add_timer (timer_t *timer) +void add_timer (struct timer_list *timer) {int cpu =get_cpu ();tvec_base_t *base = &per_cpu (tvec_bases, cpu);
@@ -200,7 +199,7 @@* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an * active timer returns 1.) */ -int mod_timer (timer_t *timer,unsigned long expires) +int mod_timer (struct timer_list *timer,unsigned long expires) {tvec_base_t *old_base, *new_base;unsigned long flags;
@@ -277,7 +276,7 @@* (ie. del_timer() of an inactive timer returns 0, del_timer() of an * active timer returns 1.) */ -int del_timer (timer_t *timer) +int del_timer (struct timer_list *timer) {unsigned long flags;tvec_base_t *base;
@@ -316,7 +315,7 @@* * The function returns whether it has deactivated a pending timer or not. */ -int del_timer_sync (timer_t *timer) +int del_timer_sync (struct timer_list *timer) {tvec_base_t *base;int i, ret =0 ;
@@ -359,9 +358,9 @@* detach them individually, just clear the list afterwards. */ while (curr != head) { -timer_t *tmp; +struct timer_list *tmp; - tmp =list_entry (curr, timer_t, entry); + tmp = list_entry(curr, struct timer_list, entry);if (tmp->base != base)BUG (); next = curr->next;
@@ -400,9 +399,9 @@if (curr != head) {void (*fn)(unsigned long );unsigned long data; -timer_t *timer; +struct timer_list *timer; - timer =list_entry (curr, timer_t, entry); + timer = list_entry(curr, struct timer_list, entry); fn = timer->function; data = timer->data;
@@ -504,6 +503,7 @@if (xtime.tv_sec %86400 ==0 ) { xtime.tv_sec--; time_state =TIME_OOP ; +clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n" ); }break ;
@@ -512,6 +512,7 @@if ((xtime.tv_sec +1 ) %86400 ==0 ) { xtime.tv_sec++; time_state =TIME_WAIT ; +clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n" ); }break ;
@@ -964,7 +965,7 @@*/ signed long schedule_timeout (signed long timeout) { -timer_t timer; +struct timer_list timer;unsigned long expire; switch (timeout)
@@ -1019,6 +1020,7 @@ {return current->pid; } +#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP struct nano_sleep_call { struct timespec *rqtp;
@@ -1088,6 +1090,7 @@ {return sys_nanosleep (parms->rqtp, parms->rmtp); } +#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP /* * sys_sysinfo - fill in sysinfo struct
Binary files linux-2.5.50-bk5-reg_fix/scripts/kallsyms and linux/scripts/kallsyms differ Binary files linux-2.5.50-bk5-reg_fix/scripts/lxdialog/lxdialog and linux/scripts/lxdialog/lxdialog differ Binary files linux-2.5.50-bk5-reg_fix/usr/gen_init_cpio and linux/usr/gen_init_cpio differ Binary files linux-2.5.50-bk5-reg_fix/usr/initramfs_data.cpio.gz and linux/usr/initramfs_data.cpio.gz differ
Re: [PATCH ] POSIX clocks & timers take 16 (NOT HIGH RES)
In reply to Linus TorvaldsNow for 2.5.50-bk7.
The changes for the new sys_call restart now allow one restart function to handle both nanosleep and clock_nanosleep. Saves a bit of code, nice.
All the requested changes and Lindent too :).
I also broke clock_nanosleep() apart much the same way nanosleep() was with the bk5 changes.
This is still this way. Should be easy to do the compat stuff.
George
Quoted 6 lines · Linus Torvalds
Ok, finally starting to look at merging this, however:
This must go (we already have a timespec, there's no way it should be here in <
asm/signal.h>):
Quoted 7 lines
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+ time_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+};
+#endif /* _STRUCT_TIMESPEC */OK.
Quoted 7 lines
and you have things like
+ if ((flags &
TIMER_ABSTIME) &&
+ (clock->clock_get!=do_posix_clock_monotonic_gettime)) {
+ }else{
+ }
A hang over from the high res code, I will remove the empty else.
Quoted 7 lines
and
+if (!p) { +printk("in sub_remove for id=%d called with null pointer.\n", id); +return(0); +}
That is in there!? I will check into and fix it.
Quoted 4 lines
and obviously the "
nanosleep()" thing and theCLOCK_NANOSLEEP_ENTRY()stuff has been discussed in the unrelated thread (ie it doesn't work for alpha or other architectures).
Right! I am merging this now.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/kernel/entry.S +14 -8
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -239,7 +238,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -315,7 +314,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -769,8 +768,15 @@ .long sys_epoll_wait .long sys_remap_file_pages .long sys_set_tid_address - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create + .long sys_timer_settime /* 260 */ + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime + .long sys_clock_gettime /* 265 */ + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -132,6 +132,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -779,6 +779,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/linkage.h> +#include <linux/time.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-i386/unistd.h +9 -0
@@ -264,6 +264,15 @@#define __NR_sys_epoll_wait 256#define __NR_remap_file_pages 257#define __NR_set_tid_address 258 +#define __NR_timer_create 259 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/id_reuse.h +119 -0
119 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +30 -0
@@ -0,0 +1,30 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int (*clock_set) (struct timespec * tp); +int (*clock_get) (struct timespec * tp); +int (*nsleep) (int flags, +struct timespec * new_setting, +struct itimerspec * old_setting); +int (*timer_set) (struct k_itimer * timr,int flags, +struct itimerspec * new_setting, +struct itimerspec * old_setting); +int (*timer_del) (struct k_itimer * timr); +void (*timer_get) (struct k_itimer * timr, +struct itimerspec * cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; + +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -276,6 +276,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -339,6 +358,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -579,6 +599,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +1 -1
@@ -224,7 +224,7 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif - +#define FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set extern long do_nanosleep (struct timespec *t);extern long do_utimes (char * filename,struct timeval * times);#endif
@@ -165,5 +180,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -23,6 +23,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +1 -1
@@ -10,7 +10,7 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \ - rcupdate.o intermodule.o extable.o + rcupdate.o intermodule.o extable.o posix-timers.o id_reuse.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -659,6 +660,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -810,6 +810,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/id_reuse.c +194 -0
194 lines not on this page · raw message
kernel/posix-timers.c +1311 -0
1,311 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -751,6 +766,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1477,8 +1498,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +17 -14
@@ -49,12 +49,11 @@struct list_head vec[TVR_SIZE ]; } tvec_root_t; -typedef struct timer_list timer_t ;struct tvec_t_base_s {spinlock_t lock;unsigned long timer_jiffies; -timer_t *running_timer; +struct timer_list *running_timer;tvec_root_t tv1;tvec_t tv2;tvec_t tv3;
@@ -67,7 +66,7 @@/* Fake initialization */ static DEFINE_PER_CPU(tvec_base_t, tvec_bases) = { SPIN_LOCK_UNLOCKED }; -static void check_timer_failed (timer_t *timer) +static void check_timer_failed (struct timer_list *timer) {static int whine_count;if (whine_count <16 ) {
@@ -85,13 +84,13 @@ timer->magic =TIMER_MAGIC ; } -static inline void check_timer (timer_t *timer) +static inline void check_timer (struct timer_list *timer) {if (timer->magic !=TIMER_MAGIC )check_timer_failed (timer); } -static inline void internal_add_timer (tvec_base_t *base,timer_t *timer) +static inline void internal_add_timer (tvec_base_t *base,struct timer_list *timer) {unsigned long expires = timer->expires;unsigned long idx = expires - base->timer_jiffies;
@@ -143,7 +142,7 @@* Timers with an ->expired field in the past will be executed in the next * timer tick. It's illegal to add an already pending timer. */ -void add_timer (timer_t *timer) +void add_timer (struct timer_list *timer) {int cpu =get_cpu ();tvec_base_t *base = &per_cpu (tvec_bases, cpu);
@@ -201,7 +200,7 @@* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an * active timer returns 1.) */ -int mod_timer (timer_t *timer,unsigned long expires) +int mod_timer (struct timer_list *timer,unsigned long expires) {tvec_base_t *old_base, *new_base;unsigned long flags;
@@ -278,7 +277,7 @@* (ie. del_timer() of an inactive timer returns 0, del_timer() of an * active timer returns 1.) */ -int del_timer (timer_t *timer) +int del_timer (struct timer_list *timer) {unsigned long flags;tvec_base_t *base;
@@ -317,7 +316,7 @@* * The function returns whether it has deactivated a pending timer or not. */ -int del_timer_sync (timer_t *timer) +int del_timer_sync (struct timer_list *timer) {tvec_base_t *base;int i, ret =0 ;
@@ -360,9 +359,9 @@* detach them individually, just clear the list afterwards. */ while (curr != head) { -timer_t *tmp; +struct timer_list *tmp; - tmp =list_entry (curr, timer_t, entry); + tmp = list_entry(curr, struct timer_list, entry);if (tmp->base != base)BUG (); next = curr->next;
@@ -401,9 +400,9 @@if (curr != head) {void (*fn)(unsigned long );unsigned long data; -timer_t *timer; +struct timer_list *timer; - timer =list_entry (curr, timer_t, entry); + timer = list_entry(curr, struct timer_list, entry); fn = timer->function; data = timer->data;
@@ -505,6 +504,7 @@if (xtime.tv_sec %86400 ==0 ) { xtime.tv_sec--; time_state =TIME_OOP ; +clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n" ); }break ;
@@ -513,6 +513,7 @@if ((xtime.tv_sec +1 ) %86400 ==0 ) { xtime.tv_sec++; time_state =TIME_WAIT ; +clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n" ); }break ;
@@ -965,7 +966,7 @@*/ signed long schedule_timeout (signed long timeout) { -timer_t timer; +struct timer_list timer;unsigned long expire; switch (timeout)
@@ -1020,6 +1021,7 @@ {return current->pid; } +#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP static long nanosleep_restart (struct restart_block *restart) {
@@ -1078,6 +1080,7 @@ }return ret; } +#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP /* * sys_sysinfo - fill in sysinfo struct
Binary files linux-2.5.50-bk7-kb/scripts/kallsyms and linux/scripts/kallsyms differ Binary files linux-2.5.50-bk7-kb/scripts/lxdialog/lxdialog and linux/scripts/lxdialog/lxdialog differ Binary files linux-2.5.50-bk7-kb/usr/gen_init_cpio and linux/usr/gen_init_cpio differ Binary files linux-2.5.50-bk7-kb/usr/initramfs_data.cpio.gz and linux/usr/initramfs_data.cpio.gz differ
Re: [PATCH ] POSIX clocks & timers take 17 (NOT HIGH RES)
In reply to Linus TorvaldsNow for 2.5.52-bk4.
Changes since last time:
Fix to kernel make file to accommodate a new source.
-----------
The changes for the new sys_call restart now allow one restart function to handle both nanosleep and clock_nanosleep. Saves a bit of code, nice.
All the requested changes and Lindent too :).
I also broke clock_nanosleep() apart much the same way nanosleep() was with the 2.5.50-bk5 changes.
This is still this way. Should be easy to do the compat stuff.
George
Quoted 6 lines · Linus Torvalds
Ok, finally starting to look at merging this, however:
This must go (we already have a timespec, there's no way it should be here in <
asm/signal.h>):
Quoted 7 lines
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+ time_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+};
+#endif /* _STRUCT_TIMESPEC */OK.
Quoted 7 lines
and you have things like
+ if ((flags &
TIMER_ABSTIME) &&
+ (clock->clock_get!=do_posix_clock_monotonic_gettime)) {
+ }else{
+ }
A hang over from the high res code, I will remove the empty else.
Quoted 7 lines
and
+if (!p) { +printk("in sub_remove for id=%d called with null pointer.\n", id); +return(0); +}
That is in there!? I will check into and fix it.
Quoted 4 lines
and obviously the "
nanosleep()" thing and theCLOCK_NANOSLEEP_ENTRY()stuff has been discussed in the unrelated thread (ie it doesn't work for alpha or other architectures).
Right! I am merging this now.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/Kconfig +101 -0
@@ -323,6 +323,107 @@ If you don't know what to do here, say N. +config HIGH_RES_TIMERS + bool "Configure High-Resolution-Timers" + help + POSIX timers are available by default. This option enables + high resolution POSIX timers. With this option the resolution + is at least 1 micro second. High resolution is not free. If + enabled this option will add a small overhead each time a + timer expires that is not on a 1/HZ tick boundry. If no such + timers are used the overhead is nil. + + This option enables two additional POSIX CLOCKS, + CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR. Note that this + option does not change the resolution of CLOCK_REALTIME or + CLOCK_MONOTONIC which remain at 1/HZ resolution. + +choice + prompt "Clock source?" + depends on HIGH_RES_TIMERS + default HIGH_RES_TIMER_TSC + help + This option allows you to choose the wall clock timer for your + system. With high resolution timers on the x86 platforms it + is best to keep the interrupt generating timer separate from + the time keeping timer. On x86 platforms there are three + possible sources implemented for the wall clock. These are: + + <timer> <resolution> + ACPI power management (pm) timer ~280 nano seconds + TSC (Time Stamp Counter) 1/CPU clock + PIT (Programmable Interrupt Timer) ~838 nano seconds + + The PIT is always used to generate clock interrupts but, in + SMP systems the APIC timers are used to drive the timer list + code. This means that, in SMP systems the PIT will not be + programmed to generate sub jiffie events and can give + reasonable service as the clock interrupt. In non SMP (UP) + systems it will be programmed to interrupt when the next timer + is to expire or on the next 1/HZ tick. For this reason it is + best to not use this timer as the wall clock timer in UP + systems. This timer has a resolution of 838 nano seconds. IN + UP SYSTEMS THIS OPTION SHOULD ONLY BE USED IF BOTH ACPI AND + TSC ARE NOT AVAILABLE. + + The TSC runs at the cpu clock rate (i.e. its resolution is + 1/CPU clock) and it has a very low access time. However, it + is subject, in some (incorrect) processors, to throttling to + cool the cpu, and to other slow downs during power management. + If your system has power managment code active these changes + are tracked by the TSC timer code. If your cpu is correct and + does not change the TSC frequency for throttling or power + management outside of the power managment kernel code, this is + the best clock timer. + + The ACPI pm timer is available on systems with Advanced + Configuration and Power Interface support. The pm timer is + available on these systems even if you don't use or enable + ACPI in the software or the BIOS (but see Default ACPI pm + timer address). The timer has a resolution of about 280 + nanoseconds, however, the access time is a bit higher than + that of the TSC. Since it is part of ACPI it is intended to + keep track of time while the system is under power management, + thus it is not subject to the power management problems of the + TSC. + + If you enable the ACPI pm timer and it can not be found, it is + possible that your BIOS is not producing the ACPI table or + that your machine does not support ACPI. In the former case, + see "Default ACPI pm timer address". If the timer is not + found the boot will fail when trying to calibrate the 'delay' + loop. + +config HIGH_RES_TIMER_ACPI_PM + bool "ACPI-pm-timer" + +config HIGH_RES_TIMER_TSC + bool "Time-stamp-counter/TSC" + depends on X86_TSC + +config HIGH_RES_TIMER_PIT + bool "Programable-interrupt-timer/PIT" + +endchoice + +config HIGH_RES_TIMER_ACPI_PM_ADD + int "Default ACPI pm timer address" + depends on HIGH_RES_TIMER_ACPI_PM + default 0 + help + This option is available for use on systems where the BIOS + does not generate the ACPI tables if ACPI is not enabled. For + example some BIOSes will not generate the ACPI tables if APM + is enabled. The ACPI pm timer is still available but can not + be found by the software. This option allows you to supply + the needed address. When the high resolution timers code + finds a valid ACPI pm timer address it reports it in the boot + messages log (look for lines that begin with + "High-res-timers:"). You can turn on the ACPI support in the + BIOS, boot the system and find this value. You can then enter + it at configure time. Both the report and the entry are in + decimal. + config PREEMPT bool "Preemptible Kernel" help
arch/i386/kernel/entry.S +15 -9
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -273,7 +272,7 @@ pushl %eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -297,7 +296,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -373,7 +372,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -827,8 +826,15 @@ .long sys_epoll_wait .long sys_remap_file_pages .long sys_set_tid_address - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create + .long sys_timer_settime /* 260 */ + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime + .long sys_clock_gettime /* 265 */ + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -132,6 +132,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -779,6 +779,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/linkage.h> +#include <linux/time.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-i386/unistd.h +9 -0
@@ -264,6 +264,15 @@#define __NR_epoll_wait 256#define __NR_remap_file_pages 257#define __NR_set_tid_address 258 +#define __NR_timer_create 259 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/id_reuse.h +119 -0
119 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +30 -0
@@ -0,0 +1,30 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int (*clock_set) (struct timespec * tp); +int (*clock_get) (struct timespec * tp); +int (*nsleep) (int flags, +struct timespec * new_setting, +struct itimerspec * old_setting); +int (*timer_set) (struct k_itimer * timr,int flags, +struct itimerspec * new_setting, +struct itimerspec * old_setting); +int (*timer_del) (struct k_itimer * timr); +void (*timer_get) (struct k_itimer * timr, +struct itimerspec * cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; + +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -276,6 +276,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -339,6 +358,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -578,6 +598,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +1 -1
@@ -224,7 +224,7 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif - +#define FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set extern long do_nanosleep (struct timespec *t);extern long do_utimes (char * filename,struct timeval * times);#endif
@@ -165,5 +180,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -23,6 +23,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +2 -1
@@ -10,7 +10,8 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \ - rcupdate.o intermodule.o extable.o params.o + rcupdate.o intermodule.o extable.o params.o \ + posix-timers.o id_reuse.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -659,6 +660,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -812,6 +812,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/id_reuse.c +194 -0
194 lines not on this page · raw message
kernel/posix-timers.c +1311 -0
1,311 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -751,6 +766,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1478,8 +1499,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +17 -14
@@ -49,12 +49,11 @@struct list_head vec[TVR_SIZE ]; } tvec_root_t; -typedef struct timer_list timer_t ;struct tvec_t_base_s {spinlock_t lock;unsigned long timer_jiffies; -timer_t *running_timer; +struct timer_list *running_timer;tvec_root_t tv1;tvec_t tv2;tvec_t tv3;
@@ -67,7 +66,7 @@/* Fake initialization */ static DEFINE_PER_CPU(tvec_base_t, tvec_bases) = { SPIN_LOCK_UNLOCKED }; -static void check_timer_failed (timer_t *timer) +static void check_timer_failed (struct timer_list *timer) {static int whine_count;if (whine_count <16 ) {
@@ -85,13 +84,13 @@ timer->magic =TIMER_MAGIC ; } -static inline void check_timer (timer_t *timer) +static inline void check_timer (struct timer_list *timer) {if (timer->magic !=TIMER_MAGIC )check_timer_failed (timer); } -static inline void internal_add_timer (tvec_base_t *base,timer_t *timer) +static inline void internal_add_timer (tvec_base_t *base,struct timer_list *timer) {unsigned long expires = timer->expires;unsigned long idx = expires - base->timer_jiffies;
@@ -143,7 +142,7 @@* Timers with an ->expired field in the past will be executed in the next * timer tick. It's illegal to add an already pending timer. */ -void add_timer (timer_t *timer) +void add_timer (struct timer_list *timer) {int cpu =get_cpu ();tvec_base_t *base = &per_cpu (tvec_bases, cpu);
@@ -201,7 +200,7 @@* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an * active timer returns 1.) */ -int mod_timer (timer_t *timer,unsigned long expires) +int mod_timer (struct timer_list *timer,unsigned long expires) {tvec_base_t *old_base, *new_base;unsigned long flags;
@@ -278,7 +277,7 @@* (ie. del_timer() of an inactive timer returns 0, del_timer() of an * active timer returns 1.) */ -int del_timer (timer_t *timer) +int del_timer (struct timer_list *timer) {unsigned long flags;tvec_base_t *base;
@@ -317,7 +316,7 @@* * The function returns whether it has deactivated a pending timer or not. */ -int del_timer_sync (timer_t *timer) +int del_timer_sync (struct timer_list *timer) {tvec_base_t *base;int i, ret =0 ;
@@ -360,9 +359,9 @@* detach them individually, just clear the list afterwards. */ while (curr != head) { -timer_t *tmp; +struct timer_list *tmp; - tmp =list_entry (curr, timer_t, entry); + tmp = list_entry(curr, struct timer_list, entry);if (tmp->base != base)BUG (); next = curr->next;
@@ -401,9 +400,9 @@if (curr != head) {void (*fn)(unsigned long );unsigned long data; -timer_t *timer; +struct timer_list *timer; - timer =list_entry (curr, timer_t, entry); + timer = list_entry(curr, struct timer_list, entry); fn = timer->function; data = timer->data;
@@ -505,6 +504,7 @@if (xtime.tv_sec %86400 ==0 ) { xtime.tv_sec--; time_state =TIME_OOP ; +clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n" ); }break ;
@@ -513,6 +513,7 @@if ((xtime.tv_sec +1 ) %86400 ==0 ) { xtime.tv_sec++; time_state =TIME_WAIT ; +clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n" ); }break ;
@@ -965,7 +966,7 @@*/ signed long schedule_timeout (signed long timeout) { -timer_t timer; +struct timer_list timer;unsigned long expire; switch (timeout)
@@ -1020,6 +1021,7 @@ {return current->pid; } +#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP static long nanosleep_restart (struct restart_block *restart) {
@@ -1078,6 +1080,7 @@ }return ret; } +#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP /* * sys_sysinfo - fill in sysinfo struct
Binary files linux-2.5.52-bk4-kb/scripts/kallsyms and linux/scripts/kallsyms differ Binary files linux-2.5.52-bk4-kb/scripts/lxdialog/lxdialog and linux/scripts/lxdialog/lxdialog differ Binary files linux-2.5.52-bk4-kb/usr/gen_init_cpio and linux/usr/gen_init_cpio differ Binary files linux-2.5.52-bk4-kb/usr/initramfs_data.cpio.gz and linux/usr/initramfs_data.cpio.gz differ
Re: [PATCH ] POSIX clocks & timers take 17.1 (NOT HIGH RES)
In reply to Linus TorvaldsOops, had a fragment from the high-res stuff in there. The change to Kconfig is now removed.
-g
Now for 2.5.52-bk4.
Changes since last time:
Fix to kernel make file to accommodate a new source.
-----------
The changes for the new sys_call restart now allow one restart function to handle both nanosleep and clock_nanosleep. Saves a bit of code, nice.
All the requested changes and Lindent too :).
I also broke clock_nanosleep() apart much the same way nanosleep() was with the 2.5.50-bk5 changes.
This is still this way. Should be easy to do the compat stuff.
George
Quoted 6 lines · Linus Torvalds
Ok, finally starting to look at merging this, however:
This must go (we already have a timespec, there's no way it should be here in <
asm/signal.h>):
Quoted 7 lines
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+ time_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+};
+#endif /* _STRUCT_TIMESPEC */OK.
Quoted 7 lines
and you have things like
+ if ((flags &
TIMER_ABSTIME) &&
+ (clock->clock_get!=do_posix_clock_monotonic_gettime)) {
+ }else{
+ }
A hang over from the high res code, I will remove the empty else.
Quoted 7 lines
and
+if (!p) { +printk("in sub_remove for id=%d called with null pointer.\n", id); +return(0); +}
That is in there!? I will check into and fix it.
Quoted 4 lines
and obviously the "
nanosleep()" thing and theCLOCK_NANOSLEEP_ENTRY()stuff has been discussed in the unrelated thread (ie it doesn't work for alpha or other architectures).
Right! I am merging this now.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/kernel/entry.S +15 -9
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -273,7 +272,7 @@ pushl %eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -297,7 +296,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -373,7 +372,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -827,8 +826,15 @@ .long sys_epoll_wait .long sys_remap_file_pages .long sys_set_tid_address - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create + .long sys_timer_settime /* 260 */ + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime + .long sys_clock_gettime /* 265 */ + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -132,6 +132,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -779,6 +779,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/linkage.h> +#include <linux/time.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-i386/unistd.h +9 -0
@@ -264,6 +264,15 @@#define __NR_epoll_wait 256#define __NR_remap_file_pages 257#define __NR_set_tid_address 258 +#define __NR_timer_create 259 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/id_reuse.h +119 -0
119 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +30 -0
@@ -0,0 +1,30 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int (*clock_set) (struct timespec * tp); +int (*clock_get) (struct timespec * tp); +int (*nsleep) (int flags, +struct timespec * new_setting, +struct itimerspec * old_setting); +int (*timer_set) (struct k_itimer * timr,int flags, +struct itimerspec * new_setting, +struct itimerspec * old_setting); +int (*timer_del) (struct k_itimer * timr); +void (*timer_get) (struct k_itimer * timr, +struct itimerspec * cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; + +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -276,6 +276,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -339,6 +358,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -578,6 +598,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +1 -1
@@ -224,7 +224,7 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif - +#define FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set extern long do_nanosleep (struct timespec *t);extern long do_utimes (char * filename,struct timeval * times);#endif
@@ -165,5 +180,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -23,6 +23,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +2 -1
@@ -10,7 +10,8 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \ - rcupdate.o intermodule.o extable.o params.o + rcupdate.o intermodule.o extable.o params.o \ + posix-timers.o id_reuse.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -659,6 +660,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -812,6 +812,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/id_reuse.c +194 -0
194 lines not on this page · raw message
kernel/posix-timers.c +1311 -0
1,311 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -751,6 +766,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1478,8 +1499,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +17 -14
@@ -49,12 +49,11 @@struct list_head vec[TVR_SIZE ]; } tvec_root_t; -typedef struct timer_list timer_t ;struct tvec_t_base_s {spinlock_t lock;unsigned long timer_jiffies; -timer_t *running_timer; +struct timer_list *running_timer;tvec_root_t tv1;tvec_t tv2;tvec_t tv3;
@@ -67,7 +66,7 @@/* Fake initialization */ static DEFINE_PER_CPU(tvec_base_t, tvec_bases) = { SPIN_LOCK_UNLOCKED }; -static void check_timer_failed (timer_t *timer) +static void check_timer_failed (struct timer_list *timer) {static int whine_count;if (whine_count <16 ) {
@@ -85,13 +84,13 @@ timer->magic =TIMER_MAGIC ; } -static inline void check_timer (timer_t *timer) +static inline void check_timer (struct timer_list *timer) {if (timer->magic !=TIMER_MAGIC )check_timer_failed (timer); } -static inline void internal_add_timer (tvec_base_t *base,timer_t *timer) +static inline void internal_add_timer (tvec_base_t *base,struct timer_list *timer) {unsigned long expires = timer->expires;unsigned long idx = expires - base->timer_jiffies;
@@ -143,7 +142,7 @@* Timers with an ->expired field in the past will be executed in the next * timer tick. It's illegal to add an already pending timer. */ -void add_timer (timer_t *timer) +void add_timer (struct timer_list *timer) {int cpu =get_cpu ();tvec_base_t *base = &per_cpu (tvec_bases, cpu);
@@ -201,7 +200,7 @@* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an * active timer returns 1.) */ -int mod_timer (timer_t *timer,unsigned long expires) +int mod_timer (struct timer_list *timer,unsigned long expires) {tvec_base_t *old_base, *new_base;unsigned long flags;
@@ -278,7 +277,7 @@* (ie. del_timer() of an inactive timer returns 0, del_timer() of an * active timer returns 1.) */ -int del_timer (timer_t *timer) +int del_timer (struct timer_list *timer) {unsigned long flags;tvec_base_t *base;
@@ -317,7 +316,7 @@* * The function returns whether it has deactivated a pending timer or not. */ -int del_timer_sync (timer_t *timer) +int del_timer_sync (struct timer_list *timer) {tvec_base_t *base;int i, ret =0 ;
@@ -360,9 +359,9 @@* detach them individually, just clear the list afterwards. */ while (curr != head) { -timer_t *tmp; +struct timer_list *tmp; - tmp =list_entry (curr, timer_t, entry); + tmp = list_entry(curr, struct timer_list, entry);if (tmp->base != base)BUG (); next = curr->next;
@@ -401,9 +400,9 @@if (curr != head) {void (*fn)(unsigned long );unsigned long data; -timer_t *timer; +struct timer_list *timer; - timer =list_entry (curr, timer_t, entry); + timer = list_entry(curr, struct timer_list, entry); fn = timer->function; data = timer->data;
@@ -505,6 +504,7 @@if (xtime.tv_sec %86400 ==0 ) { xtime.tv_sec--; time_state =TIME_OOP ; +clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n" ); }break ;
@@ -513,6 +513,7 @@if ((xtime.tv_sec +1 ) %86400 ==0 ) { xtime.tv_sec++; time_state =TIME_WAIT ; +clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n" ); }break ;
@@ -965,7 +966,7 @@*/ signed long schedule_timeout (signed long timeout) { -timer_t timer; +struct timer_list timer;unsigned long expire; switch (timeout)
@@ -1020,6 +1021,7 @@ {return current->pid; } +#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP static long nanosleep_restart (struct restart_block *restart) {
@@ -1078,6 +1080,7 @@ }return ret; } +#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP /* * sys_sysinfo - fill in sysinfo struct
Binary files linux-2.5.52-bk4-kb/scripts/kallsyms and linux/scripts/kallsyms differ Binary files linux-2.5.52-bk4-kb/scripts/lxdialog/lxdialog and linux/scripts/lxdialog/lxdialog differ Binary files linux-2.5.52-bk4-kb/usr/gen_init_cpio and linux/usr/gen_init_cpio differ Binary files linux-2.5.52-bk4-kb/usr/initramfs_data.cpio.gz and linux/usr/initramfs_data.cpio.gz differ
Re: [PATCH ] POSIX clocks & timers take 18 (NOT HIGH RES)
In reply to Linus TorvaldsNow for 2.5.53-bk5.
Changes since last time:
Change the reference kernel.
-----------
The changes for the new sys_call restart now allow one restart function to handle both nanosleep and clock_nanosleep. Saves a bit of code, nice.
All the requested changes and Lindent too :).
I also broke clock_nanosleep() apart much the same way nanosleep() was with the 2.5.50-bk5 changes.
This is still this way. Should be easy to do the compat stuff.
George
Quoted 6 lines · Linus Torvalds
Ok, finally starting to look at merging this, however:
This must go (we already have a timespec, there's no way it should be here in <
asm/signal.h>):
Quoted 7 lines
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC
+struct timespec {
+ time_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+};
+#endif /* _STRUCT_TIMESPEC */OK.
Quoted 7 lines
and you have things like
+ if ((flags &
TIMER_ABSTIME) &&
+ (clock->clock_get!=do_posix_clock_monotonic_gettime)) {
+ }else{
+ }
A hang over from the high res code, I will remove the empty else.
Quoted 7 lines
and
+if (!p) { +printk("in sub_remove for id=%d called with null pointer.\n", id); +return(0); +}
That is in there!? I will check into and fix it.
Quoted 4 lines
and obviously the "
nanosleep()" thing and theCLOCK_NANOSLEEP_ENTRY()stuff has been discussed in the unrelated thread (ie it doesn't work for alpha or other architectures).
Right! I am merging this now.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/kernel/entry.S +15 -9
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -276,7 +275,7 @@ pushl %eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -300,7 +299,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -376,7 +375,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -830,8 +829,15 @@ .long sys_epoll_wait .long sys_remap_file_pages .long sys_set_tid_address - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create + .long sys_timer_settime /* 260 */ + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime + .long sys_clock_gettime /* 265 */ + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -132,6 +132,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -778,6 +778,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/linkage.h> +#include <linux/time.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-i386/unistd.h +9 -0
@@ -264,6 +264,15 @@#define __NR_epoll_wait 256#define __NR_remap_file_pages 257#define __NR_set_tid_address 258 +#define __NR_timer_create 259 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/id_reuse.h +119 -0
119 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +30 -0
@@ -0,0 +1,30 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int (*clock_set) (struct timespec * tp); +int (*clock_get) (struct timespec * tp); +int (*nsleep) (int flags, +struct timespec * new_setting, +struct itimerspec * old_setting); +int (*timer_set) (struct k_itimer * timr,int flags, +struct itimerspec * new_setting, +struct itimerspec * old_setting); +int (*timer_del) (struct k_itimer * timr); +void (*timer_get) (struct k_itimer * timr, +struct itimerspec * cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; + +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -276,6 +276,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -339,6 +358,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -577,6 +597,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +1 -1
@@ -224,7 +224,7 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif - +#define FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set extern long do_nanosleep (struct timespec *t);extern long do_utimes (char * filename,struct timeval * times);#endif
@@ -165,5 +180,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -23,6 +23,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +2 -1
@@ -10,7 +10,8 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \ - rcupdate.o intermodule.o extable.o params.o + rcupdate.o intermodule.o extable.o params.o \ + posix-timers.o id_reuse.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -659,6 +660,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -813,6 +813,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/id_reuse.c +194 -0
194 lines not on this page · raw message
kernel/posix-timers.c +1311 -0
1,311 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -751,6 +766,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1478,8 +1499,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +17 -14
@@ -49,12 +49,11 @@struct list_head vec[TVR_SIZE ]; } tvec_root_t; -typedef struct timer_list timer_t ;struct tvec_t_base_s {spinlock_t lock;unsigned long timer_jiffies; -timer_t *running_timer; +struct timer_list *running_timer;tvec_root_t tv1;tvec_t tv2;tvec_t tv3;
@@ -67,7 +66,7 @@/* Fake initialization */ static DEFINE_PER_CPU(tvec_base_t, tvec_bases) = { SPIN_LOCK_UNLOCKED }; -static void check_timer_failed (timer_t *timer) +static void check_timer_failed (struct timer_list *timer) {static int whine_count;if (whine_count <16 ) {
@@ -85,13 +84,13 @@ timer->magic =TIMER_MAGIC ; } -static inline void check_timer (timer_t *timer) +static inline void check_timer (struct timer_list *timer) {if (timer->magic !=TIMER_MAGIC )check_timer_failed (timer); } -static inline void internal_add_timer (tvec_base_t *base,timer_t *timer) +static inline void internal_add_timer (tvec_base_t *base,struct timer_list *timer) {unsigned long expires = timer->expires;unsigned long idx = expires - base->timer_jiffies;
@@ -143,7 +142,7 @@* Timers with an ->expired field in the past will be executed in the next * timer tick. It's illegal to add an already pending timer. */ -void add_timer (timer_t *timer) +void add_timer (struct timer_list *timer) {int cpu =get_cpu ();tvec_base_t *base = &per_cpu (tvec_bases, cpu);
@@ -201,7 +200,7 @@* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an * active timer returns 1.) */ -int mod_timer (timer_t *timer,unsigned long expires) +int mod_timer (struct timer_list *timer,unsigned long expires) {tvec_base_t *old_base, *new_base;unsigned long flags;
@@ -278,7 +277,7 @@* (ie. del_timer() of an inactive timer returns 0, del_timer() of an * active timer returns 1.) */ -int del_timer (timer_t *timer) +int del_timer (struct timer_list *timer) {unsigned long flags;tvec_base_t *base;
@@ -317,7 +316,7 @@* * The function returns whether it has deactivated a pending timer or not. */ -int del_timer_sync (timer_t *timer) +int del_timer_sync (struct timer_list *timer) {tvec_base_t *base;int i, ret =0 ;
@@ -360,9 +359,9 @@* detach them individually, just clear the list afterwards. */ while (curr != head) { -timer_t *tmp; +struct timer_list *tmp; - tmp =list_entry (curr, timer_t, entry); + tmp = list_entry(curr, struct timer_list, entry);if (tmp->base != base)BUG (); next = curr->next;
@@ -401,9 +400,9 @@if (curr != head) {void (*fn)(unsigned long );unsigned long data; -timer_t *timer; +struct timer_list *timer; - timer =list_entry (curr, timer_t, entry); + timer = list_entry(curr, struct timer_list, entry); fn = timer->function; data = timer->data;
@@ -505,6 +504,7 @@if (xtime.tv_sec %86400 ==0 ) { xtime.tv_sec--; time_state =TIME_OOP ; +clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n" ); }break ;
@@ -513,6 +513,7 @@if ((xtime.tv_sec +1 ) %86400 ==0 ) { xtime.tv_sec++; time_state =TIME_WAIT ; +clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n" ); }break ;
@@ -965,7 +966,7 @@*/ signed long schedule_timeout (signed long timeout) { -timer_t timer; +struct timer_list timer;unsigned long expire; switch (timeout)
@@ -1020,6 +1021,7 @@ {return current->pid; } +#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP static long nanosleep_restart (struct restart_block *restart) {
@@ -1078,6 +1080,7 @@ }return ret; } +#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP /* * sys_sysinfo - fill in sysinfo struct
Re: [PATCH ] POSIX clocks & timers take 19 (NOT HIGH RES)
In reply to Linus TorvaldsNow for 2.5.54-bk1.
Changes since last time:
This version has a new timer id manager. Andrew Morton suggested elimination of recursion (done) and I added code to allow it to release unused nodes. The prior version only released the leaf nodes. (The id manager uses radix tree type nodes.) Also added is a reuse count so ids will not repeat for at least 256 alloc/ free cycles.
-----------
The changes for the new sys_call restart now allow one restart function to handle both nanosleep and clock_nanosleep. Saves a bit of code, nice.
All the requested changes and Lindent too :).
I also broke clock_nanosleep() apart much the same way nanosleep() was with the 2.5.50-bk5 changes.
This is still this way. Should be easy to do the compat stuff.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/kernel/entry.S +15 -9
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -276,7 +275,7 @@ pushl %eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -300,7 +299,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -376,7 +375,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -830,8 +829,15 @@ .long sys_epoll_wait .long sys_remap_file_pages .long sys_set_tid_address - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create + .long sys_timer_settime /* 260 */ + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime + .long sys_clock_gettime /* 265 */ + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -133,6 +133,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -778,6 +778,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/linkage.h> +#include <linux/time.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-i386/unistd.h +9 -0
@@ -262,6 +262,15 @@#define __NR_epoll_wait 256#define __NR_remap_file_pages 257#define __NR_set_tid_address 258 +#define __NR_timer_create 259 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/idr.h +63 -0
63 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +30 -0
@@ -0,0 +1,30 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int (*clock_set) (struct timespec * tp); +int (*clock_get) (struct timespec * tp); +int (*nsleep) (int flags, +struct timespec * new_setting, +struct itimerspec * old_setting); +int (*timer_set) (struct k_itimer * timr,int flags, +struct itimerspec * new_setting, +struct itimerspec * old_setting); +int (*timer_del) (struct k_itimer * timr); +void (*timer_get) (struct k_itimer * timr, +struct itimerspec * cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; + +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -276,6 +276,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -339,6 +358,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -576,6 +596,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +1 -1
@@ -224,7 +224,7 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif - +#define FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set extern long do_nanosleep (struct timespec *t);extern long do_utimes (char * filename,struct timeval * times);#endif
@@ -165,5 +180,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -25,6 +25,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +2 -1
@@ -10,7 +10,8 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \ - rcupdate.o intermodule.o extable.o params.o + rcupdate.o intermodule.o extable.o params.o \ + posix-timers.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -659,6 +660,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -812,6 +812,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/posix-timers.c +1316 -0
1,316 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -751,6 +766,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1478,8 +1499,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +17 -14
@@ -49,12 +49,11 @@struct list_head vec[TVR_SIZE ]; } tvec_root_t; -typedef struct timer_list timer_t ;struct tvec_t_base_s {spinlock_t lock;unsigned long timer_jiffies; -timer_t *running_timer; +struct timer_list *running_timer;tvec_root_t tv1;tvec_t tv2;tvec_t tv3;
@@ -67,7 +66,7 @@/* Fake initialization */ static DEFINE_PER_CPU(tvec_base_t, tvec_bases) = { SPIN_LOCK_UNLOCKED }; -static void check_timer_failed (timer_t *timer) +static void check_timer_failed (struct timer_list *timer) {static int whine_count;if (whine_count <16 ) {
@@ -85,13 +84,13 @@ timer->magic =TIMER_MAGIC ; } -static inline void check_timer (timer_t *timer) +static inline void check_timer (struct timer_list *timer) {if (timer->magic !=TIMER_MAGIC )check_timer_failed (timer); } -static inline void internal_add_timer (tvec_base_t *base,timer_t *timer) +static inline void internal_add_timer (tvec_base_t *base,struct timer_list *timer) {unsigned long expires = timer->expires;unsigned long idx = expires - base->timer_jiffies;
@@ -143,7 +142,7 @@* Timers with an ->expired field in the past will be executed in the next * timer tick. It's illegal to add an already pending timer. */ -void add_timer (timer_t *timer) +void add_timer (struct timer_list *timer) {int cpu =get_cpu ();tvec_base_t *base = &per_cpu (tvec_bases, cpu);
@@ -201,7 +200,7 @@* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an * active timer returns 1.) */ -int mod_timer (timer_t *timer,unsigned long expires) +int mod_timer (struct timer_list *timer,unsigned long expires) {tvec_base_t *old_base, *new_base;unsigned long flags;
@@ -278,7 +277,7 @@* (ie. del_timer() of an inactive timer returns 0, del_timer() of an * active timer returns 1.) */ -int del_timer (timer_t *timer) +int del_timer (struct timer_list *timer) {unsigned long flags;tvec_base_t *base;
@@ -317,7 +316,7 @@* * The function returns whether it has deactivated a pending timer or not. */ -int del_timer_sync (timer_t *timer) +int del_timer_sync (struct timer_list *timer) {tvec_base_t *base;int i, ret =0 ;
@@ -360,9 +359,9 @@* detach them individually, just clear the list afterwards. */ while (curr != head) { -timer_t *tmp; +struct timer_list *tmp; - tmp =list_entry (curr, timer_t, entry); + tmp = list_entry(curr, struct timer_list, entry);if (tmp->base != base)BUG (); next = curr->next;
@@ -401,9 +400,9 @@if (curr != head) {void (*fn)(unsigned long );unsigned long data; -timer_t *timer; +struct timer_list *timer; - timer =list_entry (curr, timer_t, entry); + timer = list_entry(curr, struct timer_list, entry); fn = timer->function; data = timer->data;
@@ -505,6 +504,7 @@if (xtime.tv_sec %86400 ==0 ) { xtime.tv_sec--; time_state =TIME_OOP ; +clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n" ); }break ;
@@ -513,6 +513,7 @@if ((xtime.tv_sec +1 ) %86400 ==0 ) { xtime.tv_sec++; time_state =TIME_WAIT ; +clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n" ); }break ;
@@ -965,7 +966,7 @@*/ signed long schedule_timeout (signed long timeout) { -timer_t timer; +struct timer_list timer;unsigned long expire; switch (timeout)
@@ -1020,6 +1021,7 @@ {return current->pid; } +#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP static long nanosleep_restart (struct restart_block *restart) {
@@ -1078,6 +1080,7 @@ }return ret; } +#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP /* * sys_sysinfo - fill in sysinfo struct
lib/idr.c +342 -0
342 lines not on this page · raw message
Re: [PATCH ] POSIX clocks & timers take 19.1 (NOT HIGH RES)
In reply to Linus TorvaldsRandy pointed out that the patch for the .../lib/Makefile was not included. It is now. Thanks Randy.
Now for 2.5.54-bk1.
Changes since last time:
This version has a new timer id manager. Andrew Morton suggested elimination of recursion (done) and I added code to allow it to release unused nodes. The prior version only released the leaf nodes. (The id manager uses radix tree type nodes.) Also added is a reuse count so ids will not repeat for at least 256 alloc/ free cycles.
-----------
The changes for the new sys_call restart now allow one restart function to handle both nanosleep and clock_nanosleep. Saves a bit of code, nice.
All the requested changes and Lindent too :).
I also broke clock_nanosleep() apart much the same way nanosleep() was with the 2.5.50-bk5 changes.
This is still this way. Should be easy to do the compat stuff.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/kernel/entry.S +15 -9
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -276,7 +275,7 @@ pushl %eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -300,7 +299,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -376,7 +375,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -830,8 +829,15 @@ .long sys_epoll_wait .long sys_remap_file_pages .long sys_set_tid_address - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create + .long sys_timer_settime /* 260 */ + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime + .long sys_clock_gettime /* 265 */ + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -133,6 +133,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -778,6 +778,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/linkage.h> +#include <linux/time.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-i386/unistd.h +9 -0
@@ -262,6 +262,15 @@#define __NR_epoll_wait 256#define __NR_remap_file_pages 257#define __NR_set_tid_address 258 +#define __NR_timer_create 259 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/idr.h +63 -0
63 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +30 -0
@@ -0,0 +1,30 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int (*clock_set) (struct timespec * tp); +int (*clock_get) (struct timespec * tp); +int (*nsleep) (int flags, +struct timespec * new_setting, +struct itimerspec * old_setting); +int (*timer_set) (struct k_itimer * timr,int flags, +struct itimerspec * new_setting, +struct itimerspec * old_setting); +int (*timer_del) (struct k_itimer * timr); +void (*timer_get) (struct k_itimer * timr, +struct itimerspec * cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; + +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -276,6 +276,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -339,6 +358,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -576,6 +596,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +1 -1
@@ -224,7 +224,7 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif - +#define FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set extern long do_nanosleep (struct timespec *t);extern long do_utimes (char * filename,struct timeval * times);#endif
@@ -165,5 +180,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -25,6 +25,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +2 -1
@@ -10,7 +10,8 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o platform.o pid.o \ - rcupdate.o intermodule.o extable.o params.o + rcupdate.o intermodule.o extable.o params.o \ + posix-timers.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -659,6 +660,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -812,6 +812,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/posix-timers.c +1316 -0
1,316 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -751,6 +766,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1478,8 +1499,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +17 -14
@@ -49,12 +49,11 @@struct list_head vec[TVR_SIZE ]; } tvec_root_t; -typedef struct timer_list timer_t ;struct tvec_t_base_s {spinlock_t lock;unsigned long timer_jiffies; -timer_t *running_timer; +struct timer_list *running_timer;tvec_root_t tv1;tvec_t tv2;tvec_t tv3;
@@ -67,7 +66,7 @@/* Fake initialization */ static DEFINE_PER_CPU(tvec_base_t, tvec_bases) = { SPIN_LOCK_UNLOCKED }; -static void check_timer_failed (timer_t *timer) +static void check_timer_failed (struct timer_list *timer) {static int whine_count;if (whine_count <16 ) {
@@ -85,13 +84,13 @@ timer->magic =TIMER_MAGIC ; } -static inline void check_timer (timer_t *timer) +static inline void check_timer (struct timer_list *timer) {if (timer->magic !=TIMER_MAGIC )check_timer_failed (timer); } -static inline void internal_add_timer (tvec_base_t *base,timer_t *timer) +static inline void internal_add_timer (tvec_base_t *base,struct timer_list *timer) {unsigned long expires = timer->expires;unsigned long idx = expires - base->timer_jiffies;
@@ -143,7 +142,7 @@* Timers with an ->expired field in the past will be executed in the next * timer tick. It's illegal to add an already pending timer. */ -void add_timer (timer_t *timer) +void add_timer (struct timer_list *timer) {int cpu =get_cpu ();tvec_base_t *base = &per_cpu (tvec_bases, cpu);
@@ -201,7 +200,7 @@* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an * active timer returns 1.) */ -int mod_timer (timer_t *timer,unsigned long expires) +int mod_timer (struct timer_list *timer,unsigned long expires) {tvec_base_t *old_base, *new_base;unsigned long flags;
@@ -278,7 +277,7 @@* (ie. del_timer() of an inactive timer returns 0, del_timer() of an * active timer returns 1.) */ -int del_timer (timer_t *timer) +int del_timer (struct timer_list *timer) {unsigned long flags;tvec_base_t *base;
@@ -317,7 +316,7 @@* * The function returns whether it has deactivated a pending timer or not. */ -int del_timer_sync (timer_t *timer) +int del_timer_sync (struct timer_list *timer) {tvec_base_t *base;int i, ret =0 ;
@@ -360,9 +359,9 @@* detach them individually, just clear the list afterwards. */ while (curr != head) { -timer_t *tmp; +struct timer_list *tmp; - tmp =list_entry (curr, timer_t, entry); + tmp = list_entry(curr, struct timer_list, entry);if (tmp->base != base)BUG (); next = curr->next;
@@ -401,9 +400,9 @@if (curr != head) {void (*fn)(unsigned long );unsigned long data; -timer_t *timer; +struct timer_list *timer; - timer =list_entry (curr, timer_t, entry); + timer = list_entry(curr, struct timer_list, entry); fn = timer->function; data = timer->data;
@@ -505,6 +504,7 @@if (xtime.tv_sec %86400 ==0 ) { xtime.tv_sec--; time_state =TIME_OOP ; +clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n" ); }break ;
@@ -513,6 +513,7 @@if ((xtime.tv_sec +1 ) %86400 ==0 ) { xtime.tv_sec++; time_state =TIME_WAIT ; +clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n" ); }break ;
@@ -965,7 +966,7 @@*/ signed long schedule_timeout (signed long timeout) { -timer_t timer; +struct timer_list timer;unsigned long expire; switch (timeout)
@@ -1020,6 +1021,7 @@ {return current->pid; } +#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP static long nanosleep_restart (struct restart_block *restart) {
@@ -1078,6 +1080,7 @@ }return ret; } +#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP /* * sys_sysinfo - fill in sysinfo struct
lib/Makefile +2 -2
@@ -9,11 +9,11 @@ L_TARGET := lib.a export-objs := cmdline.o dec_and_lock.o rwsem-spinlock.o rwsem.o \ - crc32.o rbtree.o radix-tree.o kobject.o + crc32.o rbtree.o radix-tree.o kobject.o idr.o obj-y := errno.o ctype.o string.o vsprintf.o brlock.o cmdline.o \ bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \ - kobject.o + kobject.o idr.o obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
lib/idr.c +342 -0
342 lines not on this page · raw message
Re: [PATCH ] POSIX clocks & timers take 20 (NOT HIGH RES)
In reply to Linus TorvaldsNow for 2.5.54-bk6.
Changes since last time:
Fixed a spin lock hand off problem in locking timers (thanks to Randy).
Fixed nanosleep to test for out of bound nano seconds (thanks to Julie).
Fixed a couple of id deallocation bugs that left old ids laying around (hay I get this one).
-----------
This version has a new timer id manager. Andrew Morton suggested elimination of recursion (done) and I added code to allow it to release unused nodes. The prior version only released the leaf nodes. (The id manager uses radix tree type nodes.) Also added is a reuse count so ids will not repeat for at least 256 alloc/ free cycles.
-----------
The changes for the new sys_call restart now allow one restart function to handle both nanosleep and clock_nanosleep. Saves a bit of code, nice.
All the requested changes and Lindent too :).
I also broke clock_nanosleep() apart much the same way nanosleep() was with the 2.5.50-bk5 changes.
This is still this way. Should be easy to do the compat stuff.
Signature · 5 lines
George Anzinger [email protected] High-res-timers: http://sourceforge.net/projects/high-res-timers/ Preemption patch: http://www.kernel.org/pub/linux/kernel/people/rml
arch/i386/kernel/entry.S +15 -9
@@ -41,7 +41,6 @@ */ #include <linux/config.h> -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/errno.h>
@@ -276,7 +275,7 @@ pushl %eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -300,7 +299,7 @@ pushl %eax # save orig_eax SAVE_ALL GET_THREAD_INFO(%ebx) - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jae syscall_badsys # system call tracing in operation testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebx)
@@ -376,7 +375,7 @@ xorl %edx,%edx call do_syscall_trace movl ORIG_EAX(%esp), %eax - cmpl $(NR_syscalls), %eax + cmpl $(nr_syscalls), %eax jnae syscall_call jmp syscall_exit
@@ -838,8 +837,15 @@ .long sys_epoll_wait .long sys_remap_file_pages .long sys_set_tid_address - - - .rept NR_syscalls-(.-sys_call_table)/4 - .long sys_ni_syscall - .endr + .long sys_timer_create + .long sys_timer_settime /* 260 */ + .long sys_timer_gettime + .long sys_timer_getoverrun + .long sys_timer_delete + .long sys_clock_settime + .long sys_clock_gettime /* 265 */ + .long sys_clock_getres + .long sys_clock_nanosleep + + +nr_syscalls=(.-sys_call_table)/4
arch/i386/kernel/time.c +1 -0
@@ -133,6 +133,7 @@ time_maxerror =NTP_PHASE_LIMIT ; time_esterror =NTP_PHASE_LIMIT ;write_unlock_irq (&xtime_lock); +clock_was_set (); }/*
fs/exec.c +1 -0
@@ -782,6 +782,7 @@flush_signal_handlers (current);flush_old_files (current->files); +exit_itimers (current);return 0 ;
include/asm-generic/siginfo.h +12 -4
@@ -43,8 +43,11 @@/* POSIX.1b timers */ struct { -unsigned int _timer1; -unsigned int _timer2; +timer_t _tid;/* timer id */ +int _overrun;/* overrun count */ +char _pad[sizeof ( __ARCH_SI_UID_T) -sizeof (int )]; +sigval_t _sigval;/* same as below */ +int _sys_private;/* not to be passed to user */ } _timer;/* POSIX.1b signals */
@@ -86,8 +89,9 @@*/ #define si_pid _sifields._kill._pid#define si_uid _sifields._kill._uid -#define si_timer1 _sifields._timer._timer1 -#define si_timer2 _sifields._timer._timer2 +#define si_tid _sifields._timer._tid +#define si_overrun _sifields._timer._overrun +#define si_sys_private _sifields._timer._sys_private#define si_status _sifields._sigchld._status#define si_utime _sifields._sigchld._utime#define si_stime _sifields._sigchld._stime
@@ -221,6 +225,7 @@#define SIGEV_SIGNAL 0/* notify via signal */ #define SIGEV_NONE 1/* other notification: meaningless */ #define SIGEV_THREAD 2/* deliver via thread creation */ +#define SIGEV_THREAD_ID 4/* deliver to thread */ #define SIGEV_MAX_SIZE 64#ifndef SIGEV_PAD_SIZE
@@ -235,6 +240,7 @@int sigev_notify;union {int _pad[SIGEV_PAD_SIZE ]; +int _tid;struct {void (*_function)(sigval_t );
@@ -247,10 +253,12 @@#define sigev_notify_function _sigev_un._sigev_thread._function#define sigev_notify_attributes _sigev_un._sigev_thread._attribute +#define sigev_notify_thread_id _sigev_un._tid#ifdef __KERNEL__struct siginfo ; +void do_schedule_next_timer (struct siginfo *info);#ifndef HAVE_ARCH_COPY_SIGINFO
include/asm-i386/posix_types.h +2 -0
@@ -22,6 +22,8 @@typedef long __kernel_time_t ;typedef long __kernel_suseconds_t ;typedef long __kernel_clock_t ; +typedef int __kernel_timer_t ; +typedef int __kernel_clockid_t ;typedef int __kernel_daddr_t ;typedef char *__kernel_caddr_t ;typedef unsigned short __kernel_uid16_t ;
include/asm-i386/signal.h +1 -0
@@ -3,6 +3,7 @@#include <linux/types.h> #include <linux/linkage.h> +#include <linux/time.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-i386/unistd.h +9 -0
@@ -262,6 +262,15 @@#define __NR_epoll_wait 256#define __NR_remap_file_pages 257#define __NR_set_tid_address 258 +#define __NR_timer_create 259 +#define __NR_timer_settime (__NR_timer_create+1) +#define __NR_timer_gettime (__NR_timer_create+2) +#define __NR_timer_getoverrun (__NR_timer_create+3) +#define __NR_timer_delete (__NR_timer_create+4) +#define __NR_clock_settime (__NR_timer_create+5) +#define __NR_clock_gettime (__NR_timer_create+6) +#define __NR_clock_getres (__NR_timer_create+7) +#define __NR_clock_nanosleep (__NR_timer_create+8)/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
include/linux/idr.h +63 -0
63 lines not on this page · raw message
include/linux/init_task.h +1 -0
@@ -93,6 +93,7 @@ .sig = &init_signals, \ .pending = { NULL, &tsk.pending.head, {{0}}}, \ .blocked = {{0}}, \ + .posix_timers = LIST_HEAD_INIT(tsk.posix_timers), \ .alloc_lock = SPIN_LOCK_UNLOCKED, \ .switch_lock = SPIN_LOCK_UNLOCKED, \ .journal_info = NULL, \
include/linux/posix-timers.h +30 -0
@@ -0,0 +1,30 @@ +#ifndef _linux_POSIX_TIMERS_H +#define _linux_POSIX_TIMERS_H + +struct k_clock { +int res;/* in nano seconds */ +int (*clock_set) (struct timespec * tp); +int (*clock_get) (struct timespec * tp); +int (*nsleep) (int flags, +struct timespec * new_setting, +struct itimerspec * old_setting); +int (*timer_set) (struct k_itimer * timr,int flags, +struct itimerspec * new_setting, +struct itimerspec * old_setting); +int (*timer_del) (struct k_itimer * timr); +void (*timer_get) (struct k_itimer * timr, +struct itimerspec * cur_setting); +}; +struct now_struct { +unsigned long jiffies; +}; + +#define posix_get_now (now) (now)->jiffies = jiffies; +#define posix_time_before (timer, now) \ + time_before((timer)->expires, (now)->jiffies) + +#define posix_bump_timer (timr) do { \ + (timr)->it_timer.expires += (timr)->it_incr; \ + (timr)->it_overrun++; \ + }while (0) +#endif
include/linux/sched.h +21 -0
@@ -276,6 +276,25 @@typedef struct prio_array prio_array_t ;struct backing_dev_info ; +/* POSIX.1b interval timer structure. */ +struct k_itimer { +struct list_head list;/* free/ allocate list */ +spinlock_t it_lock; +clockid_t it_clock;/* which timer type */ +timer_t it_id;/* timer id */ +int it_overrun;/* overrun on pending signal */ +int it_overrun_last;/* overrun on last delivered signal */ +int it_requeue_pending;/* waiting to requeue this timer */ +int it_sigev_notify;/* notify word of sigevent struct */ +int it_sigev_signo;/* signo word of sigevent struct */ +sigval_t it_sigev_value;/* value word of sigevent struct */ +unsigned long it_incr;/* interval specified in jiffies */ +struct task_struct *it_process;/* process to send signal to */ +struct timer_list it_timer; +}; + + +struct task_struct {volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ struct thread_info *thread_info;
@@ -339,6 +358,7 @@unsigned long it_real_value, it_prof_value, it_virt_value;unsigned long it_real_incr, it_prof_incr, it_virt_incr;struct timer_list real_timer; +struct list_head posix_timers;/* POSIX.1b Interval Timers */ unsigned long utime, stime, cutime, cstime;unsigned long start_time;/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
@@ -576,6 +596,7 @@extern void exit_files (struct task_struct *);extern void exit_sighand (struct task_struct *);extern void __exit_sighand (struct task_struct *); +extern void exit_itimers (struct task_struct *);extern void reparent_to_init (void );extern void daemonize (void );
include/linux/signal.h +1 -1
@@ -224,7 +224,7 @@struct pt_regs ;extern int get_signal_to_deliver (siginfo_t *info,struct pt_regs *regs);#endif - +#define FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP #endif /* __KERNEL__ */ #endif /* _LINUX_SIGNAL_H */
include/linux/sys.h +1 -2
@@ -2,9 +2,8 @@#define _LINUX_SYS_H/* -* system call entry points ... but not all are defined +* This file is no longer used or needed */ -#define NR_syscalls 260/* * These are system calls that will be removed at some time
include/linux/time.h +35 -0
@@ -40,6 +40,19 @@*/ #define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +/* Parameters used to convert the timespec values */ +#ifndef USEC_PER_SEC +#define USEC_PER_SEC (1000000L) +#endif + +#ifndef NSEC_PER_SEC +#define NSEC_PER_SEC (1000000000L) +#endif + +#ifndef NSEC_PER_USEC +#define NSEC_PER_USEC (1000L) +#endif +static __inline__unsigned long timespec_to_jiffies (struct timespec *value) {
@@ -138,6 +151,8 @@#ifdef __KERNEL__extern void do_gettimeofday (struct timeval *tv);extern void do_settimeofday (struct timeval *tv); +extern int do_sys_settimeofday (struct timeval *tv,struct timezone *tz); +extern void clock_was_set (void );// call when ever the clock is set extern long do_nanosleep (struct timespec *t);extern long do_utimes (char * filename,struct timeval * times);#endif
@@ -165,5 +180,25 @@struct timeval it_interval;/* timer interval */ struct timeval it_value; /* current value */ }; + + +/* +* The IDs of the various system clocks (for POSIX.1b interval timers). +*/ +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 1 +#define CLOCK_PROCESS_CPUTIME_ID 2 +#define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_REALTIME_HR 4 +#define CLOCK_MONOTONIC_HR 5 + +#define MAX_CLOCKS 6 + +/* +* The various flags for setting POSIX.1b interval timers. +*/ + +#define TIMER_ABSTIME 0x01 +#endif
include/linux/types.h +2 -0
@@ -25,6 +25,8 @@typedef __kernel_daddr_t daddr_t ;typedef __kernel_key_t key_t ;typedef __kernel_suseconds_t suseconds_t ; +typedef __kernel_timer_t timer_t ; +typedef __kernel_clockid_t clockid_t ;#ifdef __KERNEL__typedef __kernel_uid32_t uid_t ;
kernel/Makefile +1 -1
@@ -10,7 +10,7 @@ exit.o itimer.o time.o softirq.o resource.o \ sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o futex.o pid.o \ - rcupdate.o intermodule.o extable.o params.o + rcupdate.o intermodule.o extable.o params.o posix-timers.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o
kernel/exit.c +2 -0
@@ -411,6 +411,7 @@mmdrop (active_mm); } +/* * Turn us into a lazy TLB process if we * aren't already..
@@ -659,6 +660,7 @@__exit_files (tsk);__exit_fs (tsk);exit_namespace (tsk); +exit_itimers (tsk);exit_thread ();if (current->leader)
kernel/fork.c +1 -0
@@ -812,6 +812,7 @@ goto bad_fork_cleanup_files;if (copy_sighand (clone_flags, p)) goto bad_fork_cleanup_fs; +INIT_LIST_HEAD (&p->posix_timers);if (copy_mm (clone_flags, p)) goto bad_fork_cleanup_sighand;if (copy_namespace (clone_flags, p))
kernel/posix-timers.c +1326 -0
1,326 lines not on this page · raw message
kernel/signal.c +31 -9
@@ -457,8 +457,6 @@if (!collect_signal (sig, pending, info)) sig =0 ; -/* XXX: Once POSIX.1b timers are in, if si_code == SI_TIMER, -we need to xchg out the timer overrun values. */ }recalc_sigpending ();
@@ -473,6 +471,7 @@*/ int dequeue_signal (sigset_t *mask,siginfo_t *info) { +int ret;/* * Here we handle shared pending signals. To implement the full * semantics we need to unqueue and resend them. It will likely
@@ -483,7 +482,13 @@if (signr)__send_sig_info (signr, info, current); } -return __dequeue_signal (¤t->pending, mask, info); + ret =__dequeue_signal (¤t->pending, mask, info); +if ( ret && + ((info->si_code & __SI_MASK) == __SI_TIMER) && + info->si_sys_private){ +do_schedule_next_timer (info); + } +return ret; }static int rm_from_queue (int sig,struct sigpending *s)
@@ -622,6 +627,7 @@static int send_signal (int sig,struct siginfo *info,struct sigpending *signals) {struct sigqueue * q =NULL ; +int ret =0 ;/* * fast-pathed signals for kernel-internal things like SIGSTOP
@@ -665,17 +671,26 @@copy_siginfo (&q->info, info);break ; } - }else if (sig >=SIGRTMIN && info && (unsigned long )info !=1 + }else { +if (sig >=SIGRTMIN && info && (unsigned long )info !=1 && info->si_code !=SI_USER )/* * Queue overflow, abort. We may abort if the signal was rt * and sent by user using something other than kill(). */ -return -EAGAIN ; +return -EAGAIN ; + +if (((unsigned long )info >1 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped +* the signal. +*/ + ret = info->si_sys_private; + } out_set:sigaddset (&signals->signal, sig); -return 0 ; +return ret; }/*
@@ -715,7 +730,7 @@ {int retval =send_signal (sig, info, &t->pending); -if (!retval && !sigismember (&t->blocked, sig)) +if ((retval >=0 ) && !sigismember (&t->blocked, sig))signal_wake_up (t);return retval;
@@ -751,6 +766,12 @@handle_stop_signal (sig, t); +if (((unsigned long )info >2 ) && (info->si_code ==SI_TIMER )) +/* +* Set up a return to indicate that we dropped the signal. +*/ + ret = info->si_sys_private; +/* Optimize away the signal, if it's a signal that can be handled immediately (ie non-blocked and untraced) and that is ignored (either explicitly or by default). */
@@ -1478,8 +1499,9 @@ err |=__put_user (from->si_uid, &to->si_uid);break ;case __SI_TIMER: - err |=__put_user (from->si_timer1, &to->si_timer1); - err |=__put_user (from->si_timer2, &to->si_timer2); + err |=__put_user (from->si_tid, &to->si_tid); + err |=__put_user (from->si_overrun, &to->si_overrun); + err |=__put_user (from->si_ptr, &to->si_ptr);break ;case __SI_POLL: err |=__put_user (from->si_band, &to->si_band);
kernel/timer.c +17 -14
@@ -49,12 +49,11 @@struct list_head vec[TVR_SIZE ]; } tvec_root_t; -typedef struct timer_list timer_t ;struct tvec_t_base_s {spinlock_t lock;unsigned long timer_jiffies; -timer_t *running_timer; +struct timer_list *running_timer;tvec_root_t tv1;tvec_t tv2;tvec_t tv3;
@@ -67,7 +66,7 @@/* Fake initialization */ static DEFINE_PER_CPU(tvec_base_t, tvec_bases) = { SPIN_LOCK_UNLOCKED }; -static void check_timer_failed (timer_t *timer) +static void check_timer_failed (struct timer_list *timer) {static int whine_count;if (whine_count <16 ) {
@@ -85,13 +84,13 @@ timer->magic =TIMER_MAGIC ; } -static inline void check_timer (timer_t *timer) +static inline void check_timer (struct timer_list *timer) {if (timer->magic !=TIMER_MAGIC )check_timer_failed (timer); } -static inline void internal_add_timer (tvec_base_t *base,timer_t *timer) +static inline void internal_add_timer (tvec_base_t *base,struct timer_list *timer) {unsigned long expires = timer->expires;unsigned long idx = expires - base->timer_jiffies;
@@ -143,7 +142,7 @@* Timers with an ->expired field in the past will be executed in the next * timer tick. It's illegal to add an already pending timer. */ -void add_timer (timer_t *timer) +void add_timer (struct timer_list *timer) {int cpu =get_cpu ();tvec_base_t *base = &per_cpu (tvec_bases, cpu);
@@ -201,7 +200,7 @@* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an * active timer returns 1.) */ -int mod_timer (timer_t *timer,unsigned long expires) +int mod_timer (struct timer_list *timer,unsigned long expires) {tvec_base_t *old_base, *new_base;unsigned long flags;
@@ -278,7 +277,7 @@* (ie. del_timer() of an inactive timer returns 0, del_timer() of an * active timer returns 1.) */ -int del_timer (timer_t *timer) +int del_timer (struct timer_list *timer) {unsigned long flags;tvec_base_t *base;
@@ -317,7 +316,7 @@* * The function returns whether it has deactivated a pending timer or not. */ -int del_timer_sync (timer_t *timer) +int del_timer_sync (struct timer_list *timer) {tvec_base_t *base;int i, ret =0 ;
@@ -360,9 +359,9 @@* detach them individually, just clear the list afterwards. */ while (curr != head) { -timer_t *tmp; +struct timer_list *tmp; - tmp =list_entry (curr, timer_t, entry); + tmp = list_entry(curr, struct timer_list, entry);if (tmp->base != base)BUG (); next = curr->next;
@@ -401,9 +400,9 @@if (curr != head) {void (*fn)(unsigned long );unsigned long data; -timer_t *timer; +struct timer_list *timer; - timer =list_entry (curr, timer_t, entry); + timer = list_entry(curr, struct timer_list, entry); fn = timer->function; data = timer->data;
@@ -505,6 +504,7 @@if (xtime.tv_sec %86400 ==0 ) { xtime.tv_sec--; time_state =TIME_OOP ; +clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n" ); }break ;
@@ -513,6 +513,7 @@if ((xtime.tv_sec +1 ) %86400 ==0 ) { xtime.tv_sec++; time_state =TIME_WAIT ; +clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n" ); }break ;
@@ -965,7 +966,7 @@*/ signed long schedule_timeout (signed long timeout) { -timer_t timer; +struct timer_list timer;unsigned long expire; switch (timeout)
@@ -1020,6 +1021,7 @@ {return current->pid; } +#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP static long nanosleep_restart (struct restart_block *restart) {
@@ -1078,6 +1080,7 @@ }return ret; } +#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP /* * sys_sysinfo - fill in sysinfo struct
lib/Makefile +2 -2
@@ -9,11 +9,11 @@ L_TARGET := lib.a export-objs := cmdline.o dec_and_lock.o rwsem-spinlock.o rwsem.o \ - crc32.o rbtree.o radix-tree.o kobject.o + crc32.o rbtree.o radix-tree.o kobject.o idr.o obj-y := errno.o ctype.o string.o vsprintf.o brlock.o cmdline.o \ bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \ - kobject.o + kobject.o idr.o obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
lib/idr.c +342 -0
342 lines not on this page · raw message