From: Stephen Hemminger Date: Wed, 14 Mar 2007 17:14:07 +0000 (-0700) Subject: Revert "Increase internal clock resolution to nsec" X-Git-Tag: v2.6.23-071016~59 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=891514473be4b587f38c237c5977c8db2ca7c6df;p=thirdparty%2Fiproute2.git Revert "Increase internal clock resolution to nsec" This reverts fd784ccaf649128965be016f857708669e798479 commit. Thanks Stephen, but actually I think the last patch (increase clock resolution) shouldn't go in yet. I'm not done yet looking at all the compatibility issues and it does change the range of valid values for everything dealing with times. Most places I looked at still accept reasonable ranges, but I would feel more comfortable to make sure everything is fine first. --- diff --git a/tc/tc_core.h b/tc/tc_core.h index 28bf97a2e..a139da6f6 100644 --- a/tc/tc_core.h +++ b/tc/tc_core.h @@ -4,7 +4,7 @@ #include #include -#define TIME_UNITS_PER_SEC 1000000000 +#define TIME_UNITS_PER_SEC 1000000 int tc_core_time2big(long time); long tc_core_time2tick(long time); diff --git a/tc/tc_util.c b/tc/tc_util.c index a07c6aad9..a7e42572d 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -228,9 +228,6 @@ int get_time(unsigned *time, const char *str) else if (strcasecmp(p, "us") == 0 || strcasecmp(p, "usec")==0 || strcasecmp(p, "usecs") == 0) t *= TIME_UNITS_PER_SEC/1000000; - else if (strcasecmp(p, "ns") == 0 || strcasecmp(p, "nsec")==0 || - strcasecmp(p, "nsecs") == 0) - t *= TIME_UNITS_PER_SEC/1000000000; else return -1; } @@ -248,10 +245,8 @@ void print_time(char *buf, int len, __u32 time) snprintf(buf, len, "%.1fs", tmp/TIME_UNITS_PER_SEC); else if (tmp >= TIME_UNITS_PER_SEC/1000) snprintf(buf, len, "%.1fms", tmp/(TIME_UNITS_PER_SEC/1000)); - else if (tmp >= TIME_UNITS_PER_SEC/1000000) - snprintf(buf, len, "%.1fus", tmp/(TIME_UNITS_PER_SEC/1000000)); else - snprintf(buf, len, "%uns", time); + snprintf(buf, len, "%uus", time); } char * sprint_time(__u32 time, char *buf)