[Cake] 2 commits - unintended changes?

[Cake] 2 commits - unintended changes?

[Kevin Darbyshire-Bryant]

[-- Attachment #1: Type: text/plain, Size: 1486 bytes --]

https://github.com/dtaht/sch_cake/commit/d6a890461ddb6df72e88c20c82ea5b14eea39ef6
'move stats keeping out of inner loop' &

https://github.com/dtaht/sch_cake/commit/24a0f840d3b0c9ff2f2a10c57d12388766f7792f
'don't calculate rate unless doing autorate'

mess with things other than that which they say they're messin':


     struct cake_tin_data *b = &q->tins[q->cur_tin];
     struct cake_flow *flow;
     struct list_head *head;
-    u32 prev_drop_count, prev_ecn_mark;
+    u16 prev_drop_count, prev_ecn_mark;
     u32 len;
     u64 now = ktime_get_ns();
     s32 i;

     b->tin_dropped  += flow->cvars.drop_count - prev_drop_count;
     b->tin_ecn_mark += flow->cvars.ecn_mark   - prev_ecn_mark;
+    flow->cvars.ecn_mark = 0;
     flow->dropped        += flow->cvars.drop_count - prev_drop_count;
-    flow->dropped        += flow->cvars.ecn_mark   - prev_ecn_mark;
+    //flow->dropped        += flow->cvars.ecn_mark   - prev_ecn_mark;
 
     if (!skb) {
         /* codel dropped the last packet in this queue; try again */


2nd commit:

    b->tin_ecn_mark += flow->cvars.ecn_mark   - prev_ecn_mark;
     flow->cvars.ecn_mark = 0;
     flow->dropped        += flow->cvars.drop_count - prev_drop_count;
-    //flow->dropped        += flow->cvars.ecn_mark   - prev_ecn_mark;
 
     if (!skb) {
         /* codel dropped the last packet in this queue; try again */


Intended to change 'prev_drop_count, prev_ecn_mark' & flow->dropped ?


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4816 bytes --]

Re: [Cake] 2 commits - unintended changes?

[Dave Taht]

thx for the review. sorry for not keeping these commits more separated.

this fixes the ecn calculation which otherwise wrapped.
Dave Täht
Let's go make home routers and wifi faster! With better software!
https://www.gofundme.com/savewifi


On Fri, Nov 27, 2015 at 3:39 PM, Kevin Darbyshire-Bryant
<kevin@darbyshire-bryant.me.uk> wrote:
> https://github.com/dtaht/sch_cake/commit/d6a890461ddb6df72e88c20c82ea5b14eea39ef6
> 'move stats keeping out of inner loop' &
>
> https://github.com/dtaht/sch_cake/commit/24a0f840d3b0c9ff2f2a10c57d12388766f7792f
> 'don't calculate rate unless doing autorate'
>
> mess with things other than that which they say they're messin':
>
>
>      struct cake_tin_data *b = &q->tins[q->cur_tin];
>      struct cake_flow *flow;
>      struct list_head *head;
> -    u32 prev_drop_count, prev_ecn_mark;
> +    u16 prev_drop_count, prev_ecn_mark;
>      u32 len;
>      u64 now = ktime_get_ns();
>      s32 i;
>
>      b->tin_dropped  += flow->cvars.drop_count - prev_drop_count;
>      b->tin_ecn_mark += flow->cvars.ecn_mark   - prev_ecn_mark;
> +    flow->cvars.ecn_mark = 0;
>      flow->dropped        += flow->cvars.drop_count - prev_drop_count;
> -    flow->dropped        += flow->cvars.ecn_mark   - prev_ecn_mark;
> +    //flow->dropped        += flow->cvars.ecn_mark   - prev_ecn_mark;
>
>      if (!skb) {
>          /* codel dropped the last packet in this queue; try again */
>
>
> 2nd commit:
>
>     b->tin_ecn_mark += flow->cvars.ecn_mark   - prev_ecn_mark;
>      flow->cvars.ecn_mark = 0;
>      flow->dropped        += flow->cvars.drop_count - prev_drop_count;
> -    //flow->dropped        += flow->cvars.ecn_mark   - prev_ecn_mark;
>
>      if (!skb) {
>          /* codel dropped the last packet in this queue; try again */
>
>
> Intended to change 'prev_drop_count, prev_ecn_mark' & flow->dropped ?
>
>
> _______________________________________________
> Cake mailing list
> Cake@lists.bufferbloat.net
> https://lists.bufferbloat.net/listinfo/cake
>

Re: [Cake] 2 commits - unintended changes?

[Kevin Darbyshire-Bryant]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]



On 27/11/15 14:43, Dave Taht wrote:
> thx for the review. sorry for not keeping these commits more separated.
>
> this fixes the ecn calculation which otherwise wrapped.
> Dave Täht
> Let's go make home routers and wifi faster! With better software!
> https://www.gofundme.com/savewifi
>
I discovered the 'git commit -p' (--patch) toy the other day, when I'd
got carried away and changed a few things and then thought I should
split them across commits.  Saved me an awful lot of hassle.  Am always
learning with git :-)


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4816 bytes --]