tc_core: Use double in tc_core_time2tick()
Subsystems (2)
PATCH 1/2 tc_core: Use double in tc_core_time2tick()
Change 'time' parameters of tc_core_time2tick() and tc_core_time2big() from unsigned to double. It is especially needed to use in tc_calc_rtable() for kernels with increased psched ticks resolution, but even without this, it looks reasonable to avoid rounding here.
---
tc/tc_core.c | 10 +++++----- tc/tc_core.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)
tc/tc_core.c +5 -5
@@ -27,18 +27,18 @@static double tick_in_usec =1 ;static double clock_factor =1 ; -int tc_core_time2big (unsigned time) +int tc_core_time2big (double time) { -__u64 t = time; +__u64 t; - t *= tick_in_usec; + t = time * tick_in_usec +0.5 ;return (t >>32 ) !=0 ; } -unsigned tc_core_time2tick (unsigned time) +unsigned tc_core_time2tick (double time) { -return time*tick_in_usec; +return time * tick_in_usec +0.5 ; }unsigned tc_core_tick2time (unsigned tick)
tc/tc_core.h +2 -2
@@ -13,8 +13,8 @@ enum link_layer { }; -int tc_core_time2big (unsigned time); -unsigned tc_core_time2tick (unsigned time); +int tc_core_time2big (double time); +unsigned tc_core_time2tick (double time);unsigned tc_core_tick2time (unsigned tick);unsigned tc_core_time2ktime (unsigned time);unsigned tc_core_ktime2time (unsigned ktime);
David Miller
maintainerThis one should be "2/2" not "1/2" right? :-)
Quoted 2 lines · David Miller
This one should be "2/2" not "1/2" right? :-)
Sure! Plus a different subject. I've just resent.
Thanks for noticing this,
Jarek P.
Quoted 4 lines · Jarek Poplawski
Change 'time' parameters of
tc_core_time2tick()andtc_core_time2big()from unsigned to double. It is especially needed to use intc_calc_rtable()for kernels with increased psched ticks resolution, but even without this, it looks reasonable to avoid rounding here.
I would prefer to keep using integers, which are a lot easier to analyze for rounding errors and overflows, besides having constant granularity.
tc/tc_core.c line 41
Quoted 5 lines
tc/tc_core.c +2
-2-unsigned tc_core_time2tick (unsigned time) +unsigned tc_core_time2tick (double time) { -return time*tick_in_usec; +return time * tick_in_usec +0.5 ;
ceil()?
Quoted 1 line
}
It seems inconsistent to have the time2tick() function take a double, but return an unsigned from tick2time(). If we're going to change this, please keep them symetrical (you could even use floor() in tick2time() to make it more explicit).
Jarek Poplawski
Tested-by Antonio AlmeidaQuoted 10 lines · Patrick McHardy
Quoted 4 lines · Jarek Poplawski
Change 'time' parameters of
tc_core_time2tick()andtc_core_time2big()from unsigned to double. It is especially needed to use intc_calc_rtable()for kernels with increased psched ticks resolution, but even without this, it looks reasonable to avoid rounding here.I would prefer to keep using integers, which are a lot easier to analyze for rounding errors and overflows, besides having constant granularity.
Quoted 7 lines
Review
Quoted 5 lines
(quoted diff) +2
-2-unsigned tc_core_time2tick(unsigned time) +unsigned tc_core_time2tick(double time) { - return time*tick_in_usec; + return time * tick_in_usec + 0.5;
ceil()?
OK.
Quoted 7 lines
Quoted 2 lines
}
It seems inconsistent to have the
time2tick()function take a double, but return an unsigned fromtick2time(). If we're going to change this, please keep them symetrical (you could even usefloor()intick2time()to make it more explicit).
Let's see how it's used (mainly) in tc_calc_xmittime() e.g. for Antonio's mostly 800byte and 555Mbit rate:
tc_core_time2tick(TIME_UNITS_PER_SEC * (double)size/rate) tc_core_time2tick(1000000 * (double) 800/69375000) tc_core_time2tick(11.53153) tc_core_time2tick(11)
and let's say it's multiplied by 10. 5 ticks really make a difference. Does it make sense to round it here before full calculations?
tc_core_tick2time() is used differently; it usually gets integers, to show them as time. But even if not so, we have division here. So, I'm not sure it's really needed, but if you confirm I'll do it in a separate patch.
Thanks,
Jarek P.
--------------------> take 2
Change 'time' parameters of tc_core_time2tick() and tc_core_time2big() from unsigned to double. It is especially needed to use in tc_calc_rtable() for kernels with increased psched ticks resolution, but even without this, it looks reasonable to avoid rounding here. Additionally rounding with ceil() is used (it's safer to stay below configured rate than going beyond limits).
With feedback from: Patrick McHardy <[email protected]>
---
tc/tc_core.c | 10 +++++----- tc/tc_core.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)
tc/tc_core.c +5 -5
@@ -27,18 +27,18 @@static double tick_in_usec =1 ;static double clock_factor =1 ; -int tc_core_time2big (unsigned time) +int tc_core_time2big (double time) { -__u64 t = time; +__u64 t; - t *= tick_in_usec; + t =ceil (time * tick_in_usec);return (t >>32 ) !=0 ; } -unsigned tc_core_time2tick (unsigned time) +unsigned tc_core_time2tick (double time) { -return time*tick_in_usec; +return ceil (time * tick_in_usec); }unsigned tc_core_tick2time (unsigned tick)
tc/tc_core.h +2 -2
@@ -13,8 +13,8 @@ enum link_layer { }; -int tc_core_time2big (unsigned time); -unsigned tc_core_time2tick (unsigned time); +int tc_core_time2big (double time); +unsigned tc_core_time2tick (double time);unsigned tc_core_tick2time (unsigned tick);unsigned tc_core_time2ktime (unsigned time);unsigned tc_core_ktime2time (unsigned ktime);
Quoted 1 line · Jarek Poplawski
On Tue, Jun 09, 2009 at 04:03:16PM +0200, Patrick McHardy wrote:
...
Quoted 4 lines
Quoted 4 lines
It seems inconsistent to have the
time2tick()function take a double, but return an unsigned fromtick2time(). If we're going to change this, please keep them symetrical (you could even usefloor()intick2time()to make it more explicit).
...
Quoted 4 lines
tc_core_tick2time()is used differently; it usually gets integers, to show them as time. But even if not so, we have division here. So, I'm not sure it's really needed, but if you confirm I'll do it in a separate patch.
OOPS! I argued for double as argument, but you're right tick2time() should return double for consistency. I'll send a separate patch.
Sorry,
Jarek P.
[PATCH iproute2 3/2] tc_core: Return double from tc_core_tick2time()
In reply to Patrick McHardyHmm... I'm not sure this floor() is needed here, but maybe I'll get it tomorrow...
Thanks,
Jarek P.
-------------------------->
Quoted 4 lines · Patrick McHardy
It seems inconsistent to have the
time2tick()function take a double, but return an unsigned fromtick2time(). If we're going to change this, please keep them symetrical (you could even usefloor()intick2time()to make it more explicit).
This patch removes this inconsistency.
---
tc/tc_core.c +2 -2
@@ -41,9 +41,9 @@ unsigned tc_core_time2tick(double time)return ceil (time * tick_in_usec); } -unsigned tc_core_tick2time (unsigned tick) +double tc_core_tick2time (unsigned tick) { -return tick/tick_in_usec; +return floor (tick / tick_in_usec); }unsigned tc_core_time2ktime (unsigned time)
tc/tc_core.h +1 -1
@@ -15,7 +15,7 @@ enum link_layer {int tc_core_time2big (double time);unsigned tc_core_time2tick (double time); -unsigned tc_core_tick2time (unsigned tick); +double tc_core_tick2time (unsigned tick);unsigned tc_core_time2ktime (unsigned time);unsigned tc_core_ktime2time (unsigned ktime);unsigned tc_calc_xmittime (unsigned rate,unsigned size);
Re: [PATCH iproute2 3/2] tc_core: Return double from tc_core_tick2time()
Quoted 2 lines · Jarek Poplawski
Hmm... I'm not sure this
floor()is needed here, but maybe I'll get it tomorrow...
Its not. It was mainly a suggestion to make the symetry more explicit. I hope gcc understands :)
[PATCH iproute2 3/2 v2] tc_core: Return double from tc_core_tick2time()
Quoted 6 lines · Patrick McHardy
Quoted 2 lines · Jarek Poplawski
Hmm... I'm not sure this
floor()is needed here, but maybe I'll get it tomorrow...Its not. It was mainly a suggestion to make the symetry more explicit. I hope gcc understands :)
If so, then maybe let's reconsider previous example:
Quoted 6 lines
Let's see how it's used (mainly) in
tc_calc_xmittime()e.g. for Antonio's mostly 800byte and 555Mbit rate:
tc_core_time2tick(TIME_UNITS_PER_SEC * (double)size/rate)tc_core_time2tick(1000000 * (double) 800/69375000)tc_core_time2tick(11.53153)
Let's say it returns 116 (after x10 with ceil()). Then, going backwards:
tc_calc_xmitsize()
{
return ((double) 69375000 * tc_core_tick2time(116)) / TIME_UNITS_PER_SEC;
}would give us: 763 after /10 with floor(), and 804 without floor(). The latter looks nicer to me but I leave the choice to you or Stephen.
Thanks,
Jarek P.
--------------------------> take 2
Quoted 4 lines · Patrick McHardy
It seems inconsistent to have the
time2tick()function take a double, but return an unsigned fromtick2time(). If we're going to change this, please keep them symetrical (you could even usefloor()intick2time()to make it more explicit).
This patch removes this inconsistency.
---
tc/tc_core.c +2 -2
@@ -41,9 +41,9 @@ unsigned tc_core_time2tick(double time)return ceil (time * tick_in_usec); } -unsigned tc_core_tick2time (unsigned tick) +double tc_core_tick2time (unsigned tick) { -return tick/tick_in_usec; +return tick / tick_in_usec; }unsigned tc_core_time2ktime (unsigned time)
tc/tc_core.h +1 -1
@@ -15,7 +15,7 @@ enum link_layer {int tc_core_time2big (double time);unsigned tc_core_time2tick (double time); -unsigned tc_core_tick2time (unsigned tick); +double tc_core_tick2time (unsigned tick);unsigned tc_core_time2ktime (unsigned time);unsigned tc_core_ktime2time (unsigned ktime);unsigned tc_calc_xmittime (unsigned rate,unsigned size);
Re: [PATCH iproute2 3/2 v2] tc_core: Return double from tc_core_tick2time()
Quoted 18 lines · Jarek Poplawski
Quoted 5 lines · Patrick McHardy
Quoted 2 lines · Jarek Poplawski
Hmm... I'm not sure this
floor()is needed here, but maybe I'll get it tomorrow...Its not. It was mainly a suggestion to make the symetry more explicit. I hope gcc understands :)
If so, then maybe let's reconsider previous example:
Quoted 6 lines
Let's see how it's used (mainly) in
tc_calc_xmittime()e.g. for Antonio's mostly 800byte and 555Mbit rate:
tc_core_time2tick(TIME_UNITS_PER_SEC * (double)size/rate)tc_core_time2tick(1000000 * (double) 800/69375000)tc_core_time2tick(11.53153)Let's say it returns 116 (after x10 with
ceil()). Then, going backwards:
Quoted 7 lines
tc_calc_xmitsize(){ return ((double) 69375000 * tc_core_tick2time(116)) / TIME_UNITS_PER_SEC; }would give us: 763 after /10 with
floor(), and 804 withoutfloor(). The latter looks nicer to me but I leave the choice to you or Stephen.
Agreed, I made a thinko somewhere.