From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ob0-x235.google.com (mail-ob0-x235.google.com [IPv6:2607:f8b0:4003:c01::235]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by huchra.bufferbloat.net (Postfix) with ESMTPS id E7FB821F7C4 for ; Sun, 11 Oct 2015 14:30:51 -0700 (PDT) Received: by obbzf10 with SMTP id zf10so95279754obb.2 for ; Sun, 11 Oct 2015 14:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=Ilv5f/QM1ussHC4cqQaSm0bBBW8/uDEH7aEWq57Z/+4=; b=X9Ph1mw1RTTMlC/XFf+NYv9+XVL490WTMBHdV2x+df4F1zMDb7xrVaffSVQlOIbmnN ouhKj2/77Xm+5OCy7r0u9246S357JIVYd/Sv1YuoO4b+ku0N/AViTKLNSEbRetXzAoiS zZu4qIjhRcVpn1+n+Gq4e2Fp3aPWuuASFnzTYziEJHyn+gu1MqhxoUGUsoaNjEUrOmvO KjDbla8Ibj8oGEcd9iTLcHHHiVla88OPI7qn/5U9PLq6rINIcjUFfGukB71sDIEOObCt cjB7wBXsmgldU6RTd6GySB2NmooubipHqthL4TUqXrJErXNXaNedEGO/7lNKi1v4eIlo +XEA== MIME-Version: 1.0 X-Received: by 10.182.118.202 with SMTP id ko10mr13885583obb.25.1444599050684; Sun, 11 Oct 2015 14:30:50 -0700 (PDT) Received: by 10.202.108.212 with HTTP; Sun, 11 Oct 2015 14:30:50 -0700 (PDT) Date: Sun, 11 Oct 2015 14:30:50 -0700 Message-ID: From: Dave Taht To: cake@lists.bufferbloat.net Content-Type: multipart/mixed; boundary=089e0149c41042cd280521daedcd Subject: [Cake] start at interval handling X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.13 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Oct 2015 21:31:14 -0000 --089e0149c41042cd280521daedcd Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I couldn't figure out why xstats was a union in the fq_codel code... or rather, I got interrupted by politics before I did. Am still very interrupted... so... anyway, this does start some api breakage, also. Anyone else got braincells? --=20 Dave T=C3=A4ht Do you want faster, better, wifi? https://www.patreon.com/dtaht --089e0149c41042cd280521daedcd Content-Type: text/x-patch; charset=US-ASCII; name="start_at_interval.patch" Content-Disposition: attachment; filename="start_at_interval.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ifn0xa870 ZGlmZiAtLWdpdCBhL3BrdF9zY2hlZC5oIGIvcGt0X3NjaGVkLmgKaW5kZXggMGJhY2Q2ZS4uNGMy ZTdhMiAxMDA2NDQKLS0tIGEvcGt0X3NjaGVkLmgKKysrIGIvcGt0X3NjaGVkLmgKQEAgLTg1Miw2 ICs4NTIsMTkgQEAgc3RydWN0IHRjX3BpZV94c3RhdHMgewogfTsKIAogLyogQ0FLRSAqLworCitz dHJ1Y3QgdGNfY2FrZV9jbF9zdGF0cyB7CisJX19zMzIJZGVmaWNpdDsKKwlfX3UzMgljb3VudDsK KwlfX3UzMglkcm9wcGluZzsKKwlfX3MzMglkcm9wX25leHQ7Cit9OworCitlbnVtIHsKKwlUQ0Ff Q0FLRV9YU1RBVFNfUURJU0MsCisJVENBX0NBS0VfWFNUQVRTX0NMQVNTLAorfTsKKwogZW51bSB7 CiAJVENBX0NBS0VfVU5TUEVDLAogCVRDQV9DQUtFX0JBU0VfUkFURSwKZGlmZiAtLWdpdCBhL3Nj aF9jYWtlLmMgYi9zY2hfY2FrZS5jCmluZGV4IGEzMjQ0ZjEuLmEyMWJlNjggMTAwNjQ0Ci0tLSBh L3NjaF9jYWtlLmMKKysrIGIvc2NoX2Nha2UuYwpAQCAtMTI0LDcgKzEyNCw3IEBAIHN0cnVjdCBj YWtlX2Jpbl9kYXRhIHsKIAl1MzIJIGZsb3dzX2NudDsJLyogbnVtYmVyIG9mIGZsb3dzIC0gbXVz dCBiZSBtdWx0aXBsZSBvZgogCQkJCSAqIENBS0VfU0VUX1dBWVMKIAkJCQkgKi8KLQl1MzIJcGVy dHVyYmF0aW9uOy8qIGhhc2ggcGVydHVyYmF0aW9uICovCisJdTMyCXBlcnR1cmJhdGlvbjsgICAv KiBoYXNoIHBlcnR1cmJhdGlvbiAqLwogCXUxNglxdWFudHVtOwkvKiBwc2NoZWRfbXR1KHFkaXNj X2RldihzY2gpKTsgKi8KIAogCXN0cnVjdCBjb2RlbF9wYXJhbXMgY3BhcmFtczsKQEAgLTE3Niwx MCArMTc2LDEwIEBAIHN0cnVjdCBjYWtlX3NjaGVkX2RhdGEgewogCXUxNgkJcmF0ZV9zaGZ0Owog CXU2NAkJdGltZV9uZXh0X3BhY2tldDsKIAl1MzIJCXJhdGVfbnM7Ci0JdTE2CQlwZWVsX3RocmVz aG9sZDsKIAl1MzIJCXJhdGVfYnBzOwogCXUxNgkJcmF0ZV9mbGFnczsKLQlzaG9ydAlyYXRlX292 ZXJoZWFkOworCXUxNgkJcGVlbF90aHJlc2hvbGQ7CisJdTE2CQlyYXRlX292ZXJoZWFkOwogCiAJ LyogcmVzb3VyY2UgdHJhY2tpbmcgKi8KIAl1MzIJCWJ1ZmZlcl91c2VkOwpAQCAtMTkxLDE0ICsx OTEsMTUgQEAgc3RydWN0IGNha2Vfc2NoZWRfZGF0YSB7CiAKIAlzdHJ1Y3QgcWRpc2Nfd2F0Y2hk b2cgd2F0Y2hkb2c7CiAJdTgJCWJpbl9pbmRleFs2NF07CisJdTMyCQlpbnRlcnZhbDsgICAgICAg ICAgICAKIH07CiAKIGVudW0gewotCUNBS0VfTU9ERV9CRVNURUZGT1JUID0gMSwKKwlDQUtFX01P REVfU1FVQVNILAorCUNBS0VfTU9ERV9CRVNURUZGT1JULAogCUNBS0VfTU9ERV9QUkVDRURFTkNF LAogCUNBS0VfTU9ERV9ESUZGU0VSVjgsCiAJQ0FLRV9NT0RFX0RJRkZTRVJWNCwKLQlDQUtFX01P REVfU1FVQVNILAogCUNBS0VfTU9ERV9NQVgKIH07CiAKQEAgLTI5NywxMSArMjk4LDEwIEBAIGNh a2VfaGFzaChzdHJ1Y3QgY2FrZV9iaW5fZGF0YSAqcSwgY29uc3Qgc3RydWN0IHNrX2J1ZmYgKnNr YiwgaW50IGZsb3dfbW9kZSkKIAl9CiAKIAlob3N0X2hhc2ggPSBmbG93X2hhc2hfZnJvbV9rZXlz KCZob3N0X2tleXMpOwotCWlmICghKGZsb3dfbW9kZSAmIENBS0VfRkxPV19GTE9XUykpIHsKKwlp ZiAoIShmbG93X21vZGUgJiBDQUtFX0ZMT1dfRkxPV1MpKQogCQlmbG93X2hhc2ggPSBob3N0X2hh c2g7Ci0JfSBlbHNlIHsJCQorCWVsc2UJCQogCQlmbG93X2hhc2ggPSBmbG93X2hhc2hfZnJvbV9r ZXlzKCZrZXlzKTsKLQl9CiAjZW5kaWYKIAlyZWR1Y2VkX2hhc2ggPSByZWNpcHJvY2FsX3NjYWxl KGZsb3dfaGFzaCwgcS0+Zmxvd3NfY250KTsKIApAQCAtNzgxLDYgKzc4MSw4IEBAIHN0YXRpYyBj b25zdCBzdHJ1Y3QgbmxhX3BvbGljeSBjYWtlX3BvbGljeVtUQ0FfQ0FLRV9NQVggKyAxXSA9IHsK IAlbVENBX0NBS0VfQVRNXSAgICAgICAgICAgPSB7IC50eXBlID0gTkxBX1UzMiB9LAogCVtUQ0Ff Q0FLRV9GTE9XX01PREVdICAgICA9IHsgLnR5cGUgPSBOTEFfVTMyIH0sCiAJW1RDQV9DQUtFX09W RVJIRUFEXSAgICAgID0geyAudHlwZSA9IE5MQV9VMzIgfSwKKwlbVENBX0NBS0VfQUNUSVZFX0ZM T1dTXSAgPSB7IC50eXBlID0gTkxBX1UzMiB9LAorCVtUQ0FfQ0FLRV9SVFRdICAgICAgICAgICA9 IHsgLnR5cGUgPSBOTEFfVTMyIH0sCiB9OwogCiBzdGF0aWMgdm9pZCBjYWtlX3NldF9yYXRlKHN0 cnVjdCBjYWtlX2Jpbl9kYXRhICpiLCB1NjQgcmF0ZSwgdTMyIG10dSwKQEAgLTgzNCw3ICs4MzYs NyBAQCBzdGF0aWMgdm9pZCBjYWtlX2NvbmZpZ19iZXN0ZWZmb3J0KHN0cnVjdCBRZGlzYyAqc2No KQogCWZvciAoaSA9IDA7IGkgPCA2NDsgaSsrKQogCQlxLT5iaW5faW5kZXhbaV0gPSAwOwogCi0J Y2FrZV9zZXRfcmF0ZShiLCByYXRlLCBtdHUsIE1TMlRJTUUoNSksIE1TMlRJTUUoMTAwKSk7CisJ Y2FrZV9zZXRfcmF0ZShiLCByYXRlLCBtdHUsIE1TMlRJTUUoNSksIHEtPmludGVydmFsKTsKIAli LT5iaW5fcXVhbnR1bV9iYW5kID0gNjU1MzU7CiAJYi0+YmluX3F1YW50dW1fcHJpbyA9IDY1NTM1 OwogfQpAQCAtODU3LDcgKzg1OSw3IEBAIHN0YXRpYyB2b2lkIGNha2VfY29uZmlnX3ByZWNlZGVu Y2Uoc3RydWN0IFFkaXNjICpzY2gpCiAJZm9yIChpID0gMDsgaSA8IHEtPmJpbl9jbnQ7IGkrKykg ewogCQlzdHJ1Y3QgY2FrZV9iaW5fZGF0YSAqYiA9ICZxLT5iaW5zW2ldOwogCi0JCWNha2Vfc2V0 X3JhdGUoYiwgcmF0ZSwgbXR1LCBNUzJUSU1FKDUpLCBNUzJUSU1FKDEwMCkpOworCQljYWtlX3Nl dF9yYXRlKGIsIHJhdGUsIG10dSwgTVMyVElNRSg1KSwgcS0+aW50ZXJ2YWwpOwogCiAJCWItPmJp bl9xdWFudHVtX3ByaW8gPSBtYXhfdCh1MTYsIDFVLCBxdWFudHVtMSk7CiAJCWItPmJpbl9xdWFu dHVtX2JhbmQgPSBtYXhfdCh1MTYsIDFVLCBxdWFudHVtMik7CkBAIC05NzAsNyArOTcyLDcgQEAg c3RhdGljIHZvaWQgY2FrZV9jb25maWdfZGlmZnNlcnY4KHN0cnVjdCBRZGlzYyAqc2NoKQogCWZv ciAoaSA9IDA7IGkgPCBxLT5iaW5fY250OyBpKyspIHsKIAkJc3RydWN0IGNha2VfYmluX2RhdGEg KmIgPSAmcS0+Ymluc1tpXTsKIAotCQljYWtlX3NldF9yYXRlKGIsIHJhdGUsIG10dSwgTVMyVElN RSg1KSwgTVMyVElNRSgxMDApKTsKKwkJY2FrZV9zZXRfcmF0ZShiLCByYXRlLCBtdHUsIE1TMlRJ TUUoNSksIHEtPmludGVydmFsKTsKIAogCQliLT5iaW5fcXVhbnR1bV9wcmlvID0gbWF4X3QodTE2 LCAxVSwgcXVhbnR1bTEpOwogCQliLT5iaW5fcXVhbnR1bV9iYW5kID0gbWF4X3QodTE2LCAxVSwg cXVhbnR1bTIpOwpAQCAtMTAzMiwxMyArMTAzNCwxMyBAQCBzdGF0aWMgdm9pZCBjYWtlX2NvbmZp Z19kaWZmc2VydjQoc3RydWN0IFFkaXNjICpzY2gpCiAJfQogCiAJLyogY2xhc3MgY2hhcmFjdGVy aXN0aWNzICovCi0JY2FrZV9zZXRfcmF0ZSgmcS0+Ymluc1swXSwgcmF0ZSwgbXR1LCBNUzJUSU1F KDUpLCBNUzJUSU1FKDEwMCkpOworCWNha2Vfc2V0X3JhdGUoJnEtPmJpbnNbMF0sIHJhdGUsIG10 dSwgTVMyVElNRSg1KSwgcS0+aW50ZXJ2YWwpOwogCWNha2Vfc2V0X3JhdGUoJnEtPmJpbnNbMV0s IHJhdGUgLSAocmF0ZSA+PiA0KSwgbXR1LCBNUzJUSU1FKDUpLAotCQkgICAgICBNUzJUSU1FKDEw MCkpOworCQkgICAgICBxLT5pbnRlcnZhbCk7CiAJY2FrZV9zZXRfcmF0ZSgmcS0+Ymluc1syXSwg cmF0ZSAtIChyYXRlID4+IDIpLCBtdHUsIE1TMlRJTUUoNSksCi0JCSAgICAgIE1TMlRJTUUoMTAw KSk7CisJCSAgICAgIHEtPmludGVydmFsKTsKIAljYWtlX3NldF9yYXRlKCZxLT5iaW5zWzNdLCBy YXRlID4+IDIsIG10dSwgTVMyVElNRSg1KSwKLQkJICAgICAgTVMyVElNRSgxMDApKTsKKwkJICAg ICAgcS0+aW50ZXJ2YWwpOwogCiAJLyogcHJpb3JpdHkgd2VpZ2h0cyAqLwogCXEtPmJpbnNbMF0u YmluX3F1YW50dW1fcHJpbyA9IHF1YW50dW0gPj4gNDsKQEAgLTExMzYsNiArMTEzOCw5IEBAIHN0 YXRpYyBpbnQgY2FrZV9jaGFuZ2Uoc3RydWN0IFFkaXNjICpzY2gsIHN0cnVjdCBubGF0dHIgKm9w dCkKIAlpZiAodGJbVENBX0NBS0VfT1ZFUkhFQURdKQogCQlxLT5yYXRlX292ZXJoZWFkID0gbmxh X2dldF91MzIodGJbVENBX0NBS0VfT1ZFUkhFQURdKTsKIAorCWlmICh0YltUQ0FfQ0FLRV9SVFRd KQorCQlxLT5pbnRlcnZhbCA9ICBOU0VDX1BFUl9VU0VDICogbmxhX2dldF91MzIodGJbVENBX0NB S0VfUlRUXSk7CisKIAlpZiAocS0+YmlucykgewogCQlzY2hfdHJlZV9sb2NrKHNjaCk7CiAJCWNh a2VfcmVjb25maWd1cmUoc2NoKTsKQEAgLTEyNzEsNiArMTI3Niw5IEBAIHN0YXRpYyBpbnQgY2Fr ZV9kdW1wKHN0cnVjdCBRZGlzYyAqc2NoLCBzdHJ1Y3Qgc2tfYnVmZiAqc2tiKQogCWlmIChubGFf cHV0X3UzMihza2IsIFRDQV9DQUtFX09WRVJIRUFELCBxLT5yYXRlX292ZXJoZWFkKSkKIAkJZ290 byBubGFfcHV0X2ZhaWx1cmU7CiAKKwlpZiAobmxhX3B1dF91MzIoc2tiLCBUQ0FfQ0FLRV9SVFQs IGNvZGVsX3RpbWVfdG9fdXMocS0+aW50ZXJ2YWwpKSkKKwkJZ290byBubGFfcHV0X2ZhaWx1cmU7 CisKIAlyZXR1cm4gbmxhX25lc3RfZW5kKHNrYiwgb3B0cyk7CiAKIG5sYV9wdXRfZmFpbHVyZToK QEAgLTEzNTksMTIgKzEzNjcsMTEgQEAgc3RhdGljIGludCBjYWtlX2R1bXBfYmluKHN0cnVjdCBR ZGlzYyAqc2NoLCB1bnNpZ25lZCBsb25nIGNsLAogc3RhdGljIGludCBjYWtlX2R1bXBfY2xhc3Nf c3RhdHMoc3RydWN0IFFkaXNjICpzY2gsIHVuc2lnbmVkIGxvbmcgY2wsCiAJCQkJIHN0cnVjdCBn bmV0X2R1bXAgKmQpCiB7Ci0JLyogcmV1c2UgZnFfY29kZWwgc3RhdHMgZm9ybWF0ICovCiAJc3Ry dWN0IGNha2Vfc2NoZWRfZGF0YSAqcSA9IHFkaXNjX3ByaXYoc2NoKTsKIAlzdHJ1Y3QgY2FrZV9i aW5fZGF0YSAqYiA9IHEtPmJpbnM7CiAJdTMyIGJpbiA9IDAsIGlkeCA9IGNsIC0gMTsKIAlzdHJ1 Y3QgZ25ldF9zdGF0c19xdWV1ZSBxcyA9IHswfTsKLQlzdHJ1Y3QgdGNfZnFfY29kZWxfeHN0YXRz IHhzdGF0czsKKwlzdHJ1Y3QgdGNfY2FrZV9jbF9zdGF0cyB4c3RhdHM7CiAKIAl3aGlsZSAoYmlu IDwgcS0+YmluX2NudCAmJiBpZHggPj0gYi0+Zmxvd3NfY250KSB7CiAJCWlkeCAtPSBiLT5mbG93 c19jbnQ7CkBAIC0xMzc3LDExICsxMzg0LDkgQEAgc3RhdGljIGludCBjYWtlX2R1bXBfY2xhc3Nf c3RhdHMoc3RydWN0IFFkaXNjICpzY2gsIHVuc2lnbmVkIGxvbmcgY2wsCiAJCWNvbnN0IHN0cnVj dCBza19idWZmICpza2IgPSBmbG93LT5oZWFkOwogCiAJCW1lbXNldCgmeHN0YXRzLCAwLCBzaXpl b2YoeHN0YXRzKSk7Ci0JCXhzdGF0cy50eXBlID0gVENBX0ZRX0NPREVMX1hTVEFUU19DTEFTUzsK KwkJeHN0YXRzLnR5cGUgPSBUQ0FfQ0FLRV9YU1RBVFNfQ0xBU1M7CiAJCXhzdGF0cy5jbGFzc19z dGF0cy5kZWZpY2l0ID0gZmxvdy0+ZGVmaWNpdDsKLQkJeHN0YXRzLmNsYXNzX3N0YXRzLmxkZWxh eSA9IDA7CiAJCXhzdGF0cy5jbGFzc19zdGF0cy5jb3VudCA9IGZsb3ctPmN2YXJzLmNvdW50Owot CQl4c3RhdHMuY2xhc3Nfc3RhdHMubGFzdGNvdW50ID0gMDsKIAkJeHN0YXRzLmNsYXNzX3N0YXRz LmRyb3BwaW5nID0gZmxvdy0+Y3ZhcnMuZHJvcHBpbmc7CiAJCWlmIChmbG93LT5jdmFycy5kcm9w cGluZykgewogCQkJY29kZWxfdGRpZmZfdCBkZWx0YSA9IGZsb3ctPmN2YXJzLmRyb3BfbmV4dCAt Cg== --089e0149c41042cd280521daedcd--