diff -ruN linux-2.4.0/Documentation/Configure.help linux-2.4.0-hrtime/Documentation/Configure.help --- linux-2.4.0/Documentation/Configure.help Thu Jan 4 15:00:55 2001 +++ linux-2.4.0-hrtime/Documentation/Configure.help Thu Jan 25 13:42:14 2001 @@ -130,6 +130,23 @@ If you have system with several CPU's, you do not need to say Y here: APIC will be used automatically. +High-resolution process virtual time +CONFIG_HRTIME + This enables cycle-counter precision for process virtual time. + A timing page per task is allocated where the values are kept. + /proc/PID/hrtime can then be mmapped to access these values from + user space without having to do a syscall. + + If you don't know what to do here, say N. + +High-resolution process user and system time +CONFIG_HRUSTIME + This enables cycle-counter precision for virtualized user and system + time. Warning: Turning this option on will add code to the system + call path. + + If you don't know what to do here, say N. + Kernel math emulation CONFIG_MATH_EMULATION Linux can emulate a math coprocessor (used for floating point diff -ruN linux-2.4.0/arch/i386/config.in linux-2.4.0-hrtime/arch/i386/config.in --- linux-2.4.0/arch/i386/config.in Fri Dec 29 16:35:47 2000 +++ linux-2.4.0-hrtime/arch/i386/config.in Thu Jan 25 18:05:23 2001 @@ -45,6 +45,7 @@ # Define implied options from the CPU selection here # +unset CONFIG_X86_TSC unset CONFIG_X86_FXSR if [ "$CONFIG_M386" = "y" ]; then @@ -174,6 +175,14 @@ if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then define_bool CONFIG_HAVE_DEC_LOCK y fi + +if [ "$CONFIG_X86_TSC" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then + bool 'High-resolution process virtual time support' CONFIG_HRTIME + if [ "$CONFIG_HRTIME" = "y" ]; then + bool 'High-resolution process utime/stime support' CONFIG_HRUSTIME + fi +fi + endmenu mainmenu_option next_comment diff -ruN linux-2.4.0/arch/i386/defconfig linux-2.4.0-hrtime/arch/i386/defconfig --- linux-2.4.0/arch/i386/defconfig Sun Dec 31 11:17:18 2000 +++ linux-2.4.0-hrtime/arch/i386/defconfig Thu Jan 25 13:42:14 2001 @@ -57,6 +57,8 @@ # CONFIG_MTRR is not set CONFIG_SMP=y CONFIG_HAVE_DEC_LOCK=y +# CONFIG_HRTIME is not set +# CONFIG_HRUSTIME is not set # # General setup diff -ruN linux-2.4.0/arch/i386/kernel/entry.S linux-2.4.0-hrtime/arch/i386/kernel/entry.S --- linux-2.4.0/arch/i386/kernel/entry.S Wed Nov 8 19:09:50 2000 +++ linux-2.4.0-hrtime/arch/i386/kernel/entry.S Thu Jan 25 13:42:14 2001 @@ -43,6 +43,7 @@ #include #include #include +#include #include #define ASSEMBLY #include @@ -79,6 +80,16 @@ need_resched = 20 tsk_ptrace = 24 processor = 52 +hrtime = 28 + +/* The following are offsets into the hrtime_struct, not the task_struct */ +last_us_dispatch_low = 0 +last_us_dispatch_high = 4 +utime_low = 8 +utime_high = 12 +stime_low = 16 +stime_high = 20 +in_system = 24 ENOSYS = 38 @@ -200,8 +211,34 @@ jae badsys testb $0x02,tsk_ptrace(%ebx) # PT_TRACESYS jne tracesys +#ifdef CONFIG_HRUSTIME + pushl %eax + rdtsc # edx:eax has current timespamp value + movl hrtime(%ebx), %ebx # ebx now points to the htrime_struct + subl last_us_dispatch_low(%ebx), %eax + sbbl last_us_dispatch_high(%ebx), %edx # edx:eax has number of tics since last dispatch + addl %eax, utime_low(%ebx) + adcl %edx, utime_high(%ebx) + addl %eax, last_us_dispatch_low(%ebx) + adcl %edx, last_us_dispatch_high(%ebx) + addl $1, in_system(%ebx) + GET_CURRENT(%ebx) # ebx is now pointing back at task_struct + popl %eax # reload the system call number +#endif call *SYMBOL_NAME(sys_call_table)(,%eax,4) movl %eax,EAX(%esp) # save the return value +#ifdef CONFIG_HRUSTIME + rdtsc # edx:eax has current timespamp value + movl hrtime(%ebx), %ebx # ebx now points to the htrime_struct + subl last_us_dispatch_low(%ebx), %eax + sbbl last_us_dispatch_high(%ebx), %edx # edx:eax has number of tics since last dispatch + addl %eax, stime_low(%ebx) + adcl %edx, stime_high(%ebx) + addl %eax, last_us_dispatch_low(%ebx) + adcl %edx, last_us_dispatch_high(%ebx) + subl $1, in_system(%ebx) + GET_CURRENT(%ebx) # ebx is now pointing back at task_struct +#endif ENTRY(ret_from_sys_call) #ifdef CONFIG_SMP movl processor(%ebx),%eax diff -ruN linux-2.4.0/arch/i386/kernel/init_task.c linux-2.4.0-hrtime/arch/i386/kernel/init_task.c --- linux-2.4.0/arch/i386/kernel/init_task.c Tue Aug 3 12:32:57 1999 +++ linux-2.4.0-hrtime/arch/i386/kernel/init_task.c Thu Jan 25 13:42:14 2001 @@ -1,6 +1,10 @@ #include #include #include +#include +#ifdef CONFIG_HRTIME +#include +#endif #include #include @@ -11,6 +15,9 @@ static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS; struct mm_struct init_mm = INIT_MM(init_mm); +#ifdef CONFIG_HRTIME +static struct hrtime_struct init_hrtime = INIT_HRTIME; +#endif /* * Initial task structure. diff -ruN linux-2.4.0/fs/proc/Makefile linux-2.4.0-hrtime/fs/proc/Makefile --- linux-2.4.0/fs/proc/Makefile Fri Dec 29 16:07:23 2000 +++ linux-2.4.0-hrtime/fs/proc/Makefile Thu Jan 25 14:26:52 2001 @@ -18,4 +18,6 @@ obj-y += proc_devtree.o endif +obj-$(CONFIG_HRTIME) += hrtime.o + include $(TOPDIR)/Rules.make diff -ruN linux-2.4.0/fs/proc/base.c linux-2.4.0-hrtime/fs/proc/base.c --- linux-2.4.0/fs/proc/base.c Thu Nov 16 15:18:26 2000 +++ linux-2.4.0-hrtime/fs/proc/base.c Thu Jan 25 13:42:14 2001 @@ -495,6 +495,9 @@ PROC_PID_STATM, PROC_PID_MAPS, PROC_PID_CPU, +#ifdef CONFIG_HRTIME + PROC_PID_HRTIME, +#endif PROC_PID_FD_DIR = 0x8000, /* 0x8000-0xffff */ }; @@ -509,6 +512,9 @@ #ifdef CONFIG_SMP E(PROC_PID_CPU, "cpu", S_IFREG|S_IRUGO), #endif +#ifdef CONFIG_HRTIME + E(PROC_PID_HRTIME, "hrtime", S_IFREG|S_IRUSR), +#endif E(PROC_PID_MAPS, "maps", S_IFREG|S_IRUGO), E(PROC_PID_MEM, "mem", S_IFREG|S_IRUSR|S_IWUSR), E(PROC_PID_CWD, "cwd", S_IFLNK|S_IRWXUGO), @@ -854,6 +860,11 @@ case PROC_PID_CPU: inode->i_fop = &proc_info_file_operations; inode->u.proc_i.op.proc_read = proc_pid_cpu; + break; +#endif +#ifdef CONFIG_HRTIME + case PROC_PID_HRTIME: + inode->i_fop = &proc_hrtime_operations; break; #endif case PROC_PID_MEM: diff -ruN linux-2.4.0/fs/proc/hrtime.c linux-2.4.0-hrtime/fs/proc/hrtime.c --- linux-2.4.0/fs/proc/hrtime.c Wed Dec 31 18:00:00 1969 +++ linux-2.4.0-hrtime/fs/proc/hrtime.c Thu Jan 25 13:48:35 2001 @@ -0,0 +1,138 @@ +/* + * linux/fs/proc/hrtime.c + * + * Copyright (C) 1999, Nick Rasmussen + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#define PROC_BLOCK_SIZE (3*1024) + +static void hrtime_vm_open(struct vm_area_struct *area) +{ + ref_hrtime_struct((struct hrtime_struct *) area->vm_file->private_data); +} + +static void hrtime_vm_close(struct vm_area_struct *area) +{ + unref_hrtime_struct((struct hrtime_struct *) area->vm_file->private_data); +} + +static struct vm_operations_struct hrtime_vm_ops = { + open: hrtime_vm_open, + close: hrtime_vm_close, +}; + +/* + * hrtime_mmap will map another (or your own) process' hrtime_struct + * into your address space. + */ +int hrtime_mmap(struct file *file, struct vm_area_struct * vma) +{ + int error = 0; + + vma->vm_ops = &hrtime_vm_ops; + + read_lock(&tasklist_lock); + + /* The timing page can only be mapped readonly */ + if ((pgprot_val(vma->vm_page_prot) & PROT_WRITE) != 0) { + error = -EPERM; + goto exit_with_unlock; + } + + /* We only allow mapping exactly one page -- the hrtime page */ + if (vma->vm_end - vma->vm_start != PAGE_SIZE) { + error = -EINVAL; + goto exit_with_unlock; + } + + error = remap_page_range(vma->vm_start, + virt_to_phys(file->private_data), + PAGE_SIZE, vma->vm_page_prot); + + if (error == 0) + ref_hrtime_struct((struct hrtime_struct *) file->private_data); + +exit_with_unlock: + + read_unlock(&tasklist_lock); + + return error; +} + +static int hrtime_open(struct inode *inode, struct file *file) +{ + unsigned int pid; + int error = 0; + struct task_struct * tsk; + + pid = inode->i_ino >> 16; + + if (!pid) { + return -EBADF; + } + + file->private_data = 0; + + read_lock(&tasklist_lock); + + tsk = current; + + if (pid != tsk->pid) + tsk = find_task_by_pid(pid); + + if (tsk == NULL) + { + error = -ESRCH; + goto exit_with_unlock; + } + + file->private_data = tsk->hrtime; + + ref_hrtime_struct(file->private_data); + +exit_with_unlock: + + read_unlock(&tasklist_lock); + return error; +} + +/* + * When closing /proc/PID/hrtime, unref the respective processes hrtime field + */ +static int hrtime_release(struct inode *inode, struct file *file) +{ + /* Do I really need to grab the tasklist lock here? I am changing + * fields inside a potential task. + */ + read_lock(&tasklist_lock); + + if (file->private_data != 0) { + unref_hrtime_struct(file->private_data); + } + + read_unlock(&tasklist_lock); + + return 0; +} + +struct file_operations proc_hrtime_operations = { + mmap: hrtime_mmap, + open: hrtime_open, + release: hrtime_release, +}; + diff -ruN linux-2.4.0/include/asm-i386/hrtime.h linux-2.4.0-hrtime/include/asm-i386/hrtime.h --- linux-2.4.0/include/asm-i386/hrtime.h Wed Dec 31 18:00:00 1969 +++ linux-2.4.0-hrtime/include/asm-i386/hrtime.h Thu Jan 25 13:42:14 2001 @@ -0,0 +1,23 @@ +#ifndef _ASM_HRTIME_H +#define _ASM_HRTIME_H +/* + * linux/include/asm-i386/hrtime.h + * + * Copyright (C) 1999, Nick Rasmussen + */ + +#include + +#include + +typedef unsigned long long hrtime_t; + +static inline void get_current_hrtime(volatile hrtime_t *t) +{ + volatile unsigned long *parts = (volatile unsigned long *) t; + + rdtsc(parts[0], parts[1]); + return; +} + +#endif diff -ruN linux-2.4.0/include/linux/hrtime.h linux-2.4.0-hrtime/include/linux/hrtime.h --- linux-2.4.0/include/linux/hrtime.h Wed Dec 31 18:00:00 1969 +++ linux-2.4.0-hrtime/include/linux/hrtime.h Thu Jan 25 14:12:10 2001 @@ -0,0 +1,91 @@ +#ifndef _LINUX_HRTIME_H +#define _LINUX_HRTIME_H +/* + * include/linux/hrtime.h + * + * High-resolution process timing + * + * Copyright (C) 1999, Nick Rasmussen + */ + +#include + +#include +#include + +/* Will be 1 once the cpu-cpu offset code for smp boxes is written */ +#define HRTIME_HAS_OFFSETS 0 + +/* + * Careful if you add fields to this struct - the offsets to utime and + * stime are hard-coded in arch/i386/kernel/entry.S + */ +struct hrtime_struct +{ + /* These fields are only used if CONFIG_USTIME is enabled */ + /* dispatch times are non-zero only when the process is executing */ + volatile hrtime_t last_us_dispatch; + volatile hrtime_t utime; + volatile hrtime_t stime; + volatile long in_system; + + /* A flag as to wether CONFIG_USTIME is enabled. This is so that + * the hrtime interface can be binary compatible between kernels + * compiled with and without CONFIG_USTIME + */ + long has_ustime; + + /* start_time's value is with reference to cpu0 */ + hrtime_t start_time; + + /* dispatch times are non-zero only when the process is executing */ + volatile hrtime_t last_dispatch; + volatile hrtime_t vtime; + + volatile long offset_to_cpu0; + + long refcount; + spinlock_t reflock; +}; + +#ifdef __KERNEL__ + +#ifdef CONFIG_HRTIME + +# ifdef CONFIG_HRUSTIME +# define HRTIME_HAS_USTIME 1 +# else +# define HRTIME_HAS_USTIME 0 +# endif + +#define INIT_HRTIME { \ +/* last_us_dispatch */ 0, \ +/* utime */ 0, \ +/* stime */ 0, \ +/* in_system */ 1, \ +/* has_ustime */ HRTIME_HAS_USTIME, \ +/* start_time */ 0, \ +/* last_dispatch */ 0, \ +/* vtime */ 0, \ +/* offset_to_cpu0 */ 0, \ +/* refcount */ 1, \ +/* reflock */ SPIN_LOCK_UNLOCKED } + +extern struct hrtime_struct init_hrtime; +#define INIT_HRTIME_ADDR &init_hrtime + +#else /* CONFIG_HRTIME */ + +#define INIT_HRTIME_ADDR NULL + +#endif /* CONFIG_HRTIME */ + + +extern struct hrtime_struct *alloc_hrtime_struct(void); +extern void init_hrtime_struct(struct hrtime_struct *s); +extern void ref_hrtime_struct(struct hrtime_struct *s); +extern void unref_hrtime_struct(struct hrtime_struct *s); + +#endif /* __KERNEL__ */ + +#endif diff -ruN linux-2.4.0/include/linux/proc_fs.h linux-2.4.0-hrtime/include/linux/proc_fs.h --- linux-2.4.0/include/linux/proc_fs.h Thu Jan 4 16:50:54 2001 +++ linux-2.4.0-hrtime/include/linux/proc_fs.h Thu Jan 25 14:12:26 2001 @@ -113,6 +113,9 @@ extern struct file_operations proc_kcore_operations; extern struct file_operations proc_kmsg_operations; extern struct file_operations ppc_htab_operations; +#ifdef CONFIG_HRTIME +extern struct file_operations proc_hrtime_operations; +#endif /* * proc_tty.c diff -ruN linux-2.4.0/include/linux/sched.h linux-2.4.0-hrtime/include/linux/sched.h --- linux-2.4.0/include/linux/sched.h Thu Jan 4 16:50:47 2001 +++ linux-2.4.0-hrtime/include/linux/sched.h Thu Jan 25 14:12:10 2001 @@ -26,6 +26,7 @@ #include #include #include +#include /* * cloning flags: @@ -289,7 +290,7 @@ volatile long need_resched; unsigned long ptrace; - int lock_depth; /* Lock depth */ + struct hrtime_struct *hrtime; /* * offset 32 begins here on 32-bit platforms. We keep @@ -312,6 +313,8 @@ struct task_struct *next_task, *prev_task; struct mm_struct *active_mm; + int lock_depth; /* Lock depth */ + /* task state */ struct linux_binfmt *binfmt; int exit_code, exit_signal; @@ -442,7 +445,7 @@ sigpending: 0, \ addr_limit: KERNEL_DS, \ exec_domain: &default_exec_domain, \ - lock_depth: -1, \ + hrtime: INIT_HRTIME_ADDR, \ counter: DEF_COUNTER, \ nice: DEF_NICE, \ policy: SCHED_OTHER, \ @@ -452,6 +455,7 @@ run_list: LIST_HEAD_INIT(tsk.run_list), \ next_task: &tsk, \ prev_task: &tsk, \ + lock_depth: -1, \ p_opptr: &tsk, \ p_pptr: &tsk, \ thread_group: LIST_HEAD_INIT(tsk.thread_group), \ diff -ruN linux-2.4.0/kernel/Makefile linux-2.4.0-hrtime/kernel/Makefile --- linux-2.4.0/kernel/Makefile Fri Dec 29 16:07:24 2000 +++ linux-2.4.0-hrtime/kernel/Makefile Thu Jan 25 14:26:28 2001 @@ -18,6 +18,7 @@ obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_MODULES) += ksyms.o +obj-$(CONFIG_HRTIME) += hrtime.o obj-$(CONFIG_PM) += pm.o ifneq ($(CONFIG_IA64),y) diff -ruN linux-2.4.0/kernel/exit.c linux-2.4.0-hrtime/kernel/exit.c --- linux-2.4.0/kernel/exit.c Thu Jan 4 03:00:35 2001 +++ linux-2.4.0-hrtime/kernel/exit.c Thu Jan 25 13:42:14 2001 @@ -12,6 +12,9 @@ #ifdef CONFIG_BSD_PROCESS_ACCT #include #endif +#ifdef CONFIG_HRTIME +#include +#endif #include #include @@ -62,6 +65,10 @@ if (current->counter >= MAX_COUNTER) current->counter = MAX_COUNTER; free_task_struct(p); +#ifdef CONFIG_HRTIME + unref_hrtime_struct(p->hrtime); + p->hrtime = 0; +#endif } else { printk("task releasing itself\n"); } diff -ruN linux-2.4.0/kernel/fork.c linux-2.4.0-hrtime/kernel/fork.c --- linux-2.4.0/kernel/fork.c Wed Jan 3 22:45:26 2001 +++ linux-2.4.0-hrtime/kernel/fork.c Thu Jan 25 13:42:15 2001 @@ -557,6 +557,9 @@ { int retval = -ENOMEM; struct task_struct *p; +#ifdef CONFIG_HRTIME + struct hrtime_struct *h; +#endif DECLARE_MUTEX_LOCKED(sem); if (clone_flags & CLONE_PID) { @@ -571,6 +574,15 @@ if (!p) goto fork_out; +#ifdef CONFIG_HRTIME + h = alloc_hrtime_struct(); + if (!h) + { + free_task_struct(p); + goto fork_out; + } +#endif + *p = *current; retval = -EAGAIN; @@ -624,6 +636,14 @@ p->tty_old_pgrp = 0; p->times.tms_utime = p->times.tms_stime = 0; p->times.tms_cutime = p->times.tms_cstime = 0; + +#ifdef CONFIG_HRTIME + p->hrtime = h; + /* re-zero on fork - is this the semantic that we want? */ + init_hrtime_struct(p->hrtime); + ref_hrtime_struct(p->hrtime); +#endif + #ifdef CONFIG_SMP { int i; diff -ruN linux-2.4.0/kernel/hrtime.c linux-2.4.0-hrtime/kernel/hrtime.c --- linux-2.4.0/kernel/hrtime.c Wed Dec 31 18:00:00 1969 +++ linux-2.4.0-hrtime/kernel/hrtime.c Thu Jan 25 16:57:09 2001 @@ -0,0 +1,123 @@ +/* + * linux/kernel/hrtime.c + * + * Copyright (C) 1999, Nick Rasmussen + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#ifndef virt_to_page +#define virt_to_page(x) MAP_NR(x) +#endif + +#define HRTIME_DEBUG_ALLOC 0 + +#if HRTIME_DEBUG_ALLOC +static volatile atomic_t num_hrtime_structs = ATOMIC_INIT(1); /* due to init_hrtime */ +#endif + +struct hrtime_struct *alloc_hrtime_struct() +{ + unsigned long page; + + /* Should this be using vmalloc etc. as does drivers/char/bttv.c? */ + struct hrtime_struct *hr = (struct hrtime_struct *) __get_free_page(GFP_KERNEL); + if (hr != 0) + { + page = virt_to_phys(hr); + mem_map_reserve(virt_to_page(__va(page))); +#if HRTIME_DEBUG_ALLOC + atomic_inc(&num_hrtime_structs); + printk("alloc_hrtime_struct: num_hrtime_structs are %d\n", atomic_read(&num_hrtime_structs)); +#endif + } + return hr; +} + +static void free_hrtime_struct(struct hrtime_struct *s) +{ + unsigned long page; + if (s == 0) + return; + + page = virt_to_phys(s); + mem_map_unreserve(virt_to_page(__va(page))); + free_page((unsigned long) s); + +#if HRTIME_DEBUG_ALLOC + atomic_dec(&num_hrtime_structs); + printk("free_hrtime_struct: num_hrtime_structs are %d\n", atomic_read(&num_hrtime_structs)); +#endif +} + +void init_hrtime_struct(struct hrtime_struct *s) +{ + get_current_hrtime(&s->start_time); + + /* These are meaningless when CONFIG_HRUSTIME is not defined */ + s->last_us_dispatch = s->start_time; + s->utime = 0; + s->stime = 0; + + /* in_system starts out as zero since processes exiting from fork + * do not leave on the system call return path. */ + s->in_system = 0; + +#ifdef CONFIG_HRUSTIME + s->has_ustime = 1; +#else + s->has_ustime = 0; +#endif + + s->last_dispatch = s->start_time; + s->vtime = 0; + + /* XXX - FIXME when we do the cpu offset timings */ + s->offset_to_cpu0 = 0; + + s->refcount = 0; + s->reflock = SPIN_LOCK_UNLOCKED; +} + +void ref_hrtime_struct(struct hrtime_struct *s) +{ + unsigned long flags; + + if (s == 0) + return; + + spin_lock_irqsave(&s->reflock, flags); + s->refcount += 1; + spin_unlock_irqrestore(&s->reflock, flags); +} + +void unref_hrtime_struct(struct hrtime_struct *s) +{ + unsigned long flags; + + if (s == 0) + return; + + spin_lock_irqsave(&s->reflock, flags); + s->refcount -= 1; + + if (s->refcount == 0) + free_hrtime_struct(s); + + if (s->refcount < 0) + printk("unref_hrtime_struct: unreffing s@0x%08lx, " + "refcount %ld is now negative\n", + (unsigned long) s, s->refcount); + + spin_unlock_irqrestore(&s->reflock, flags); +} diff -ruN linux-2.4.0/kernel/sched.c linux-2.4.0-hrtime/kernel/sched.c --- linux-2.4.0/kernel/sched.c Thu Jan 4 15:50:38 2001 +++ linux-2.4.0-hrtime/kernel/sched.c Thu Jan 25 13:42:15 2001 @@ -28,6 +28,9 @@ #include #include +#ifdef CONFIG_HRTIME +#include +#endif extern void timer_bh(void); extern void tqueue_bh(void); @@ -611,6 +614,36 @@ #endif /* CONFIG_SMP */ +#ifdef CONFIG_HRTIME + { + hrtime_t t; + get_current_hrtime(&t); + + prev->hrtime->vtime += t - prev->hrtime->last_dispatch; + + /* A poor man's interprocess synchronization - by overloading + * last_dispatch to also indicate that the process is currently + * executing, the spin-loop in the get_hr[usv]time to make sure + * that this process' hrtime_struct is self-consistent is + * simplified a bit. With no good way of doing atomic operations + * between the two processes, having last_dispatch change both + * when the process is swapped out and swapped in is an almost + * foolproof way of doing this. + */ + prev->hrtime->last_dispatch = 0; +#ifdef CONFIG_HRUSTIME + t -= prev->hrtime->last_us_dispatch; + if (prev->hrtime->in_system) + prev->hrtime->stime += t; + else + prev->hrtime->utime += t; + + /* ditto for last_us_dispatch */ + prev->hrtime->last_us_dispatch = 0; +#endif + } +#endif + kstat.context_swtch++; /* * there are 3 processes which are affected by a context switch: @@ -647,6 +680,16 @@ */ switch_to(prev, next, prev); __schedule_tail(prev); + +#ifdef CONFIG_HRTIME +#if HRTIME_HAS_OFFSETS + /* XXX - FIXME - find CPU and insert offset */ +#endif + get_current_hrtime(¤t->hrtime->last_dispatch); +#ifdef CONFIG_HRUSTIME + get_current_hrtime(¤t->hrtime->last_us_dispatch); +#endif +#endif same_process: reacquire_kernel_lock(current);