Index: /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c =================================================================== --- /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (revision 9235) +++ /trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (revision 9236) @@ -1,2 +1,3 @@ +/* $Rev:$ */ /** @file * The VirtualBox Support Driver - Linux hosts. @@ -154,21 +155,4 @@ #endif - -/** @def ONE_MSEC_IN_JIFFIES - * The number of jiffies that make up 1 millisecond. Must be at least 1! */ -#if HZ <= 1000 -# define ONE_MSEC_IN_JIFFIES 1 -#elif !(HZ % 1000) -# define ONE_MSEC_IN_JIFFIES (HZ / 1000) -#else -# define ONE_MSEC_IN_JIFFIES ((HZ + 999) / 1000) -# error "HZ is not a multiple of 1000, the GIP stuff won't work right!" -#endif - -/** @def TICK_NSEC - * The time between ticks in nsec */ -#ifndef TICK_NSEC -# define TICK_NSEC (1000000UL / HZ) -#endif #ifdef CONFIG_X86_LOCAL_APIC Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 9235) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 9236) @@ -930,4 +930,5 @@ r0drv/linux/spinlock-r0drv-linux.c \ r0drv/linux/thread-r0drv-linux.c \ + r0drv/linux/time-r0drv-linux.c \ r0drv/memobj-r0drv.cpp ## @todo thread2-r0drv-linux.c, timer-r0drv-linux.c and assert-r0drv-linux.c Index: /trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (revision 9235) +++ /trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (revision 9236) @@ -77,7 +77,10 @@ #include #include +#include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7) -# include # include +#endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) +# include #endif #include @@ -248,4 +251,21 @@ #endif +/** @def ONE_MSEC_IN_JIFFIES + * The number of jiffies that make up 1 millisecond. Must be at least 1! */ +#if HZ <= 1000 +# define ONE_MSEC_IN_JIFFIES 1 +#elif !(HZ % 1000) +# define ONE_MSEC_IN_JIFFIES (HZ / 1000) +#else +# define ONE_MSEC_IN_JIFFIES ((HZ + 999) / 1000) +# error "HZ is not a multiple of 1000, the GIP stuff won't work right!" +#endif + +/** @def TICK_NSEC + * The time between ticks in nsec */ +#ifndef TICK_NSEC +# define TICK_NSEC (1000000UL / HZ) +#endif + /* * Stop using the linux bool type. Index: /trunk/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c (revision 9236) +++ /trunk/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c (revision 9236) @@ -0,0 +1,182 @@ +/* $Id: $ */ +/** @file + * IPRT - Time, Ring-0 Driver, Linux. + */ + +/* + * Copyright (C) 2006-2008 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#define LOG_GROUP RTLOGGROUP_TIME +#include "the-linux-kernel.h" +#include +#include + + + +DECLINLINE(uint64_t) rtTimeGetSystemNanoTS(void) +{ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) + /* + * Use ktime_get, this is also what clock_gettime(CLOCK_MONOTONIC,) is using. + */ + ktime_t Kt = ktime_get(); + struct timespec Ts = ktime_to_timespec(Kt); + uint64_t u64 = Ts.tv_sec * UINT64_C(1000000000) + + Ts.tv_nsec; + return u64; + +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 60) + /* + * Seems there is no way of getting to the exact source of + * sys_clock_gettime(CLOCK_MONOTONIC, &ts) here, I think. But + * 64-bit jiffies adjusted for the initial value should be pretty + * much the same I hope. + */ + uint64_t u64 = get_jiffies_64(); +# ifdef INITIAL_JIFFIES + u64 += INITIAL_JIFFIES; +# endif + u64 *= TICK_NSEC; + return u64; + +#else /* < 2.5.60 */ +# if BITS_PER_LONG >= 64 + /* + * This is the same as above, except that there is no get_jiffies_64() + * here and we rely on long, and therefor jiffies, being 64-bit instead. + */ + uint64_t u64 = jiffies; +# ifdef INITIAL_JIFFIES + u64 += INITIAL_JIFFIES; +# endif + u64 *= TICK_NSEC; + return u64; + +# else /* 32 bit jiffies */ + /* + * We'll have to try track jiffy rollovers here or we'll be + * in trouble every time it flips. + * + * The high dword of the s_u64Last is the rollover count, the + * low dword is the previous jiffies. Updating is done by + * atomic compare & exchange of course. + */ + static uint64_t volatile s_u64Last = 0; + uint64_t u64; + + for (;;) + { + uint64_t u64NewLast; + int32_t iDelta; + uint32_t cRollovers; + uint32_t u32LastJiffies; + + /* sample the values */ + unsigned long ulNow = jiffies; + uint64_t u64Last = s_u64Last; + if (ulNow != jiffies) + continue; /* try again */ +# ifdef INITIAL_JIFFIES + ulNow += INITIAL_JIFFIES; +# endif + + u32LastJiffies = (uint32_t)u64Last; + cRollovers = u64Last >> 32; + + /* + * Check for rollover and update the static last value. + * + * We have to make sure we update it successfully to rule out + * an underrun because of racing someone. + */ + iDelta = ulNow - u32LastJiffies; + if (iDelta < 0) + { + cRollovers++; + u64NewLast = RT_MAKE_U64(ulNow, cRollovers); + if (!ASMAtomicCmpXchgU64(&s_u64Last, u64NewLast, u64Last)) + continue; /* race, try again */ + } + else + { + u64NewLast = RT_MAKE_U64(ulNow, cRollovers); + ASMAtomicCmpXchgU64(&s_u64Last, u64NewLast, u64Last); + } + + /* calcuate the return value */ + u64 = ulNow; + u64 *= TICK_NSEC; + u64 += cRollovers * (_4G * TICK_NSEC); + break; + } + + return u64; +# endif /* 32 bit jiffies */ +#endif /* < 2.5.60 */ +} + + +RTDECL(uint64_t) RTTimeNanoTS(void) +{ + return rtTimeGetSystemNanoTS(); +} + + +RTDECL(uint64_t) RTTimeMilliTS(void) +{ + return rtTimeGetSystemNanoTS() / 1000000; +} + + +RTDECL(uint64_t) RTTimeSystemNanoTS(void) +{ + return rtTimeGetSystemNanoTS(); +} + + +RTDECL(uint64_t) RTTimeSystemMilliTS(void) +{ + return rtTimeGetSystemNanoTS() / 1000000; +} + + +RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime) +{ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) + ktime_t Kt = ktime_get_real(); + struct timespec Ts = ktime_to_timespec(Kt); + return RTTimeSpecSetTimespec(pTime, &Ts); + +#else /* < 2.6.16 */ + struct timeval Tv; + do_gettimeofday(&Tv); + return RTTimeSpecSetTimeval(pTime, &Tv); +#endif +} +