lkml.org 
[lkml]   [2004]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: /proc or ps tools bug? 2.6.3, time is off
    On Thu, 15 Apr 2004, Petri Kaukasoina wrote:

    > If we are still talking about the problem with ps showing process start
    > times in future, I'm sorry neither of the patches helped. The error grows
    > here at a rate of 15 seconds in 24 hours as before.

    Oops...
    sure, it cannot. Maybe this one is better...


    --- linux-2.6.5/include/linux/times.h 2004-02-04 04:43:09.000000000 +0100
    +++ linux-2.6.5-jfix1/include/linux/times.h 2004-04-15 12:59:05.000000000 +0200
    @@ -6,11 +6,16 @@
    #include <asm/types.h>
    #include <asm/param.h>

    -#if (HZ % USER_HZ)==0
    -# define jiffies_to_clock_t(x) ((x) / (HZ / USER_HZ))
    -#else
    -# define jiffies_to_clock_t(x) ((clock_t) jiffies_64_to_clock_t((u64) x))
    -#endif
    +static inline clock_t jiffies_to_clock_t(long x)
    +{
    +#if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
    + return x / (HZ / USER_HZ);
    +#else
    + u64 tmp = (u64)x * TICK_NSEC;
    + do_div(tmp, (NSEC_PER_SEC / USER_HZ));
    + return (long)tmp;
    +#endif
    +}

    static inline unsigned long clock_t_to_jiffies(unsigned long x)
    {
    @@ -34,7 +39,7 @@ static inline unsigned long clock_t_to_j

    static inline u64 jiffies_64_to_clock_t(u64 x)
    {
    -#if (HZ % USER_HZ)==0
    +#if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
    do_div(x, HZ / USER_HZ);
    #else
    /*
    @@ -42,8 +47,8 @@ static inline u64 jiffies_64_to_clock_t(
    * but even this doesn't overflow in hundreds of years
    * in 64 bits, so..
    */
    - x *= USER_HZ;
    - do_div(x, HZ);
    + x *= TICK_NSEC;
    + do_div(x, (NSEC_PER_SEC / USER_HZ));
    #endif
    return x;
    }
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:02    [W:0.021 / U:31.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site