From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0079.outbound.protection.outlook.com [104.47.1.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 4C7D73BA8E for ; Sun, 11 Mar 2018 05:20:10 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=nezjFelsgN1W52gfYlDbJobl4wQqUAD7QWI06zBXjfE=; b=IkHMFQ5Ex/FwdYcGecapy/8pBJ+xDd6MFRVsuFyr4HXqZasD9AsmKQJpUwkqywwW81mFZkqAvR0kd+/ApGU3aZS2sY6k8PJHCKCOQoeRea3vwEtt4zT9gNR3QuzHcwShvI7CpEls+ldVG43d3GrcHCwxSe/wy0antXalqGGLuHs= Received: from Kevins-MBP.darbyshire-bryant.me.uk (151.231.154.194) by AM6PR0702MB3736.eurprd07.prod.outlook.com (2603:10a6:209:12::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.7; Sun, 11 Mar 2018 09:20:08 +0000 From: Kevin Darbyshire-Bryant To: cake@lists.bufferbloat.net Cc: Kevin Darbyshire-Bryant Date: Sun, 11 Mar 2018 09:19:30 +0000 Message-Id: <20180311091930.86264-3-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180311091930.86264-1-ldir@darbyshire-bryant.me.uk> References: <20180311091930.86264-1-ldir@darbyshire-bryant.me.uk> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [151.231.154.194] X-ClientProxiedBy: DB6P195CA0012.EURP195.PROD.OUTLOOK.COM (2603:10a6:4:cb::22) To AM6PR0702MB3736.eurprd07.prod.outlook.com (2603:10a6:209:12::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de78e8b0-4fca-4326-686e-08d5873148e9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4604075)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:AM6PR0702MB3736; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3736; 3:4U7/024JKCe/2uCz6cWbQQFkgW+mtHKicIbnMfMPL7CDsyAYLOJWYr8VFuqvMcSubJ5RwnigKeXHZ0Tw3+YAFbq+SsGuPqR6CBqWipplYZ+bIuIVYvBp1LjMnJo0dWTVi26T3vmY0islK2HPaxkcXX1GGLF3N1qNzmwoMFSpqrRd6Pd2epwhWgnfJImK+a3IAe3JxDmDOy88W3fLSjatQDsCOVX2vxhW/9BhVvmzdulRtb6nc5C8B5SErTpDceLs; 25:437ROTALtJLMwjaTVZXNUGzrZkac/9MFiSAk3tCWGi75D6Pbsn64mtYlfXPH0Hwah0ij25lnCQwl6vgtilNdVIW7rLkz+KA+wRCmtoNkgZ9+PmDw8DB3ZrGfFHRCYiy8CKYOC1RgWk3+CL1CaC4NajarVOOV4DAk1rWGHgQ26PaHcodraY9NIiUKFJ9XuHlqus6ZZ9zFd71gZ6AEIJdu/M8IX5yPoY321ubWtsTEpQlm9V1wOmtclqCzAYtc0+7VKjYyEnhYytXkDndAqMBcWj6eOULa+TZBKO87rBYT9U0ItK8FlntKJ+bp02X8Mk3vWeo+69Iv6AuuPg6C1XbS1A==; 31:+h7MFryZMMmwqhvolbpfJIU9QJyg4IvVUKqqDTbRhLwaWKQTSFHxgXpLr58tsBMGdlyqu2ETFHqVO9ufC3Na25sh7dZEBMmr5MossMBtXaCaQy5vIbCKIO5ssoFQxMBLH3rd9nEBHJt4zruwUiFu7o0ImeHA/IQgEDkWxEHK040Fu7jXeoZQFV6NaI2i/9SUWUy7ljC+/Lctft0fWJXtATweVXZ7axXEeWhx1JCyhUo= X-MS-TrafficTypeDiagnostic: AM6PR0702MB3736: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231220)(944501244)(52105095)(6041310)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(2016111802025)(6043046)(6072148)(201708071742011); SRVR:AM6PR0702MB3736; BCL:0; PCL:0; RULEID:; SRVR:AM6PR0702MB3736; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3736; 4:yASh/eHYWib4JR4duG38mneGIhHpmwXiUXxP4UcRxR5U05usYQgE6HA1kYhoWgbIXI87OXV36UP6lrxkRJeH9jfzKMEdrQXw36UxuvyNPTaymCktvhZUOsTL9+Rbj/CkX8gUiXXJaaWS5wdwy9V3TLs2kZIMpBG8brX7t65W2x15l/dSJhsdt7GqDZDZju+oaCfQszb4a+nAcQ02eZzymv9Uc+P/tLmr0iwhL/Pll80l8ooyCKwOUuriU9BvLRAI51Z8K1K12hWJI+NfLBorqw== X-Forefront-PRVS: 0608DEDB67 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(396003)(366004)(39380400002)(39830400003)(189003)(199004)(2361001)(2950100002)(575784001)(6916009)(106356001)(69596002)(7696005)(53416004)(51416003)(16526019)(59450400001)(316002)(16586007)(66066001)(47776003)(50226002)(5660300001)(6666003)(76176011)(36756003)(52116002)(305945005)(7736002)(81156014)(8936002)(81166006)(97736004)(8676002)(2351001)(4326008)(186003)(25786009)(74482002)(107886003)(386003)(53936002)(26005)(6486002)(2906002)(105586002)(48376002)(68736007)(50466002)(6116002)(1076002)(478600001)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0702MB3736; H:Kevins-MBP.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR0702MB3736; 23:riHRXC/mLs7i4dBxBUkwFFX+O4j5MQSYEiVX6va?= =?us-ascii?Q?rpcrTHsWEA4xox9Q1r0XWFiMYbmL7Ul+uW0rXeQA6S98fd0XO3VyIwx2Kz/w?= =?us-ascii?Q?YqK1AclU8rsHNNbp4U7DoKGP1Wd6kIpWBp5RIS1i6g6KKmLbz/q73RFo8Y6L?= =?us-ascii?Q?pAsxBTF5XpxXFcR7xOCvpHVfE/RbcpAOEHKSWR/5SqqhWBT5tqq4XrbP7jva?= =?us-ascii?Q?rHa+O8bOyfmLcEbWtEnDvbt8qcyG9fP935h+XsFe77toKs6NB2TlxM8WNgCI?= =?us-ascii?Q?GsHsW4qf8rRfd9DIqFuUemoocifHbZ/GLCMQ4FDvHFvqZTHg+a+MNmNIALyJ?= =?us-ascii?Q?mFdhLAbI60/aXwS5HE+SvCdPe4ao3I3Q1/A+VXe8yiybml1c9k1ShUUi8CII?= =?us-ascii?Q?juOHR3L6s3+uIDeJZm527dZv5D34cMGs0MQulecWhnSv7OgzVvYWMee+/gM1?= =?us-ascii?Q?Nxt0R8Nr9Wjwm55DvEgSit2RLstQW1Rn7HQ9z4mW56mo1jXx8kEWRTuiYjSG?= =?us-ascii?Q?xY3vAxePSbx3A3qMPG4eRVBhO5iSWoyUxbXi/WiURpA0ZoOtl04sjjILwC/5?= =?us-ascii?Q?dt3jfhQgjki51djt0I0BswnHQnNLtruDZZewOsx1oSKyMuCAvLV6l+yoKlGK?= =?us-ascii?Q?w5XxHw45IlB4CtVHlqXtuvkDar6FlrTKDiIvH1gz61+zIoREf3YOxiQS2aFY?= =?us-ascii?Q?U9z328qu7MLfBKU6bOc8qx4CWe85//sio/3bCSxQSA4ReKW1Wg1LztFU21vW?= =?us-ascii?Q?0yH22hyNrEyzvK4zEbzNwcBrUUmPfMT6Hs7u8WHMAIj3RfPGA/ZFyFCfxLjl?= =?us-ascii?Q?Hd5hEpxsmC66Jd8hW24c/fEBRFWOrb1iZD887sYu1SbnvsczU9vry1uaidNQ?= =?us-ascii?Q?8le2arOgYJktoThChBcyoZ7j4nX2+8YyX9pZs2FuXbrPCZwDlSaldnPZRp+Z?= =?us-ascii?Q?gAfuMGHgeryNqczeJ+hhzY6Zu9paqkF0Rpnbp62CKTxAeWrvCm9GgbM+W2Pb?= =?us-ascii?Q?Nnv8HM8HkSK1x0m/dWv7NXdlOJ19F5tp3knrcxY7nIqo2RHoNk6NNaNfTXhN?= =?us-ascii?Q?7k/Uvn3GwNb7w3iPUKGiNJ3MU5VlQ7/QPFjXefSq3ctvp3SsZCdWh2DBWTC+?= =?us-ascii?Q?u/nOn4i8dvD4Ldy5qeOUep1CAwbaH8sC3FYjSgLqlVFkoK2IUzn9YAF/7BIN?= =?us-ascii?Q?nCsQEjrs9qNOo6natPHGN0UESPqZZoQZlWDkPcfmp+0qzHjVB6SdyHZxAtM7?= =?us-ascii?Q?hbOFVkRLLs08hH/zJ4Ic=3D?= X-Microsoft-Antispam-Message-Info: V0V4mRL+tdxI5PlY4z9CVgYFDZGzh5/+tc8/Pb9jYz2hb/9fiNO3R/E8jTx395CvltAeqLslHnQD98yeoLImersW+rihOWInP0ZMMwDXmb+AK1qWWPRbPy/6gtSkTC50FBahdTA4mpAtkBnY3LaIbczwpx4DrLB2uaItLqQ4EJnNku/LAjzliEgFjc7PTWRc X-Microsoft-Exchange-Diagnostics: 1; AM6PR0702MB3736; 6:2ZFhXIK09QaARnja8ZavA7uGPgwEzQ0w0Yn5tJrIuxo6Eylj4JYicNqo8u8QUF6nrjE/lKk5eUbblFhehI6NqkCGuUT4JdXXNe0A6ezlUmYVDK+/3hP+4OL1TODtahvS0D/QcOqmjFkc73JxG5ackz4uyxQGWCZIp80AUnSoVuxOWPgVFvn4pRipIbHq1rP7iE/6xIyT8Hc/4B68CK6Y3ypWOThEF2EpZtgzbWt4wRS5y7XUTmr4lbOYksFILJ2w7UX2Up51J1VxHSVfcCo8QC79g2/XtmbUjpk9q4VBvs5CXm7JB0jDgGKn2c+J7Pbly7TEpVKG2+RtJguwnAe6Vu5Bx05N+7eJtxYgYSOEg74=; 5:uNoSkQI0yfaUehuMCmBju0RCw0TrDqDs8zItg4QPqHuY1Ck1NH2CzDKg/5JygTIPeJ5FbYRw42EJF6RsWJixXvOQiVRaxGM41c//BdkZa0rK4ZettQpAOhF71HJDo6VehGQua8/Y1CHOvFb64Zf13cWiClXJzcsCPKX9jRyo1Lw=; 24:QnHyKziEuklUV9VpkHTfhzxhSN+ioDps+n4IOVyz1T380mqSBYORoWTdobJXfw89HIkeM0i6YgQFygfN/+vYpoy4NG+uu2nh8EO1vYZg4rQ=; 7:l0U9hRAWeXtS33r7vu5wM8gRnWWjdm4xgBq44qZYDLpB67WizvtwJtfUHVuc2NOdHr0118JF/ygrb+jy3Mi5YN1hCZEoT1gzgRkGcNVyszJpVCX5MOkoSS2SK1pWXNb1MghBqekDutykU6BigPcGSq3ScaNBIeFQ/0s/qn+JDSy5C5zqmWa/wcUzJUhoH8DYfx1iy6upONFnsLh3trQMBDm2SCX5iSg7do2hJS5AnNXc7m2CBPYIuZ2/Ajzq+a4w SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2018 09:20:08.7477 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de78e8b0-4fca-4326-686e-08d5873148e9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0702MB3736 Subject: [Cake] [PATCH 2/2] tc print_uint format fixes X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 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 Mar 2018 09:20:10 -0000 Signed-off-by: Kevin Darbyshire-Bryant --- tc/tc_qdisc.c | 3 ++- tc/tc_util.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c index 70279b9d..3ec74a1c 100644 --- a/tc/tc_qdisc.c +++ b/tc/tc_qdisc.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "utils.h" #include "tc_util.h" @@ -264,7 +265,7 @@ int print_qdisc(const struct sockaddr_nl *who, } if (t->tcm_info != 1) - print_uint(PRINT_ANY, "refcnt", "refcnt %u ", t->tcm_info); + print_uint(PRINT_ANY, "refcnt", "refcnt %" PRIu64 " ", t->tcm_info); if (tb[TCA_HW_OFFLOAD] && (rta_getattr_u8(tb[TCA_HW_OFFLOAD]))) diff --git a/tc/tc_util.c b/tc/tc_util.c index aceb0d94..1b4501d8 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -714,10 +714,10 @@ void print_action_control(FILE *f, const char *prefix, open_json_object("control_action"); print_string(PRINT_ANY, "type", "%s", action_n2a(action)); if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN)) - print_uint(PRINT_ANY, "chain", " chain %u", + print_uint(PRINT_ANY, "chain", " chain %" PRIu64 , action & TC_ACT_EXT_VAL_MASK); if (TC_ACT_EXT_CMP(action, TC_ACT_JUMP)) - print_uint(PRINT_ANY, "jump", " %u", + print_uint(PRINT_ANY, "jump", " %" PRIu64 , action & TC_ACT_EXT_VAL_MASK); close_json_object(); print_string(PRINT_FP, NULL, "%s", suffix); @@ -770,17 +770,17 @@ void print_tm(FILE *f, const struct tcf_t *tm) if (tm->install != 0) { print_uint(PRINT_JSON, "installed", NULL, tm->install); - print_uint(PRINT_FP, NULL, " installed %u sec", + print_uint(PRINT_FP, NULL, " installed %" PRIu64 " sec", (unsigned int)(tm->install/hz)); } if (tm->lastuse != 0) { print_uint(PRINT_JSON, "last_used", NULL, tm->lastuse); - print_uint(PRINT_FP, NULL, " used %u sec", + print_uint(PRINT_FP, NULL, " used %" PRIu64 " sec", (unsigned int)(tm->lastuse/hz)); } if (tm->expires != 0) { print_uint(PRINT_JSON, "expires", NULL, tm->expires); - print_uint(PRINT_FP, NULL, " expires %u sec", + print_uint(PRINT_FP, NULL, " expires %" PRIu64 " sec", (unsigned int)(tm->expires/hz)); } } @@ -798,17 +798,17 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat memcpy(&bs, RTA_DATA(tbs[TCA_STATS_BASIC]), MIN(RTA_PAYLOAD(tbs[TCA_STATS_BASIC]), sizeof(bs))); print_string(PRINT_FP, NULL, "%s", prefix); print_lluint(PRINT_ANY, "bytes", "Sent %llu bytes", bs.bytes); - print_uint(PRINT_ANY, "packets", " %u pkt", bs.packets); + print_uint(PRINT_ANY, "packets", " %" PRIu64 " pkt", bs.packets); } if (tbs[TCA_STATS_QUEUE]) { struct gnet_stats_queue q = {0}; memcpy(&q, RTA_DATA(tbs[TCA_STATS_QUEUE]), MIN(RTA_PAYLOAD(tbs[TCA_STATS_QUEUE]), sizeof(q))); - print_uint(PRINT_ANY, "drops", " (dropped %u", q.drops); - print_uint(PRINT_ANY, "overlimits", ", overlimits %u", + print_uint(PRINT_ANY, "drops", " (dropped %" PRIu64, q.drops); + print_uint(PRINT_ANY, "overlimits", ", overlimits %" PRIu64, q.overlimits); - print_uint(PRINT_ANY, "requeues", " requeues %u) ", q.requeues); + print_uint(PRINT_ANY, "requeues", " requeues %" PRIu64 ") ", q.requeues); } if (tbs[TCA_STATS_RATE_EST64]) { @@ -833,7 +833,7 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat print_uint(PRINT_JSON, "rate", NULL, re.bps); print_string(PRINT_FP, NULL, "rate %s", sprint_rate(re.bps, b1)); - print_uint(PRINT_ANY, "pps", " %upps", re.pps); + print_uint(PRINT_ANY, "pps", " %" PRIu64 "pps", re.pps); } if (tbs[TCA_STATS_QUEUE]) { @@ -845,8 +845,8 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat print_uint(PRINT_JSON, "backlog", NULL, q.backlog); print_string(PRINT_FP, NULL, "backlog %s", sprint_size(q.backlog, b1)); - print_uint(PRINT_ANY, "qlen", " %up", q.qlen); - print_uint(PRINT_FP, NULL, " requeues %u", q.requeues); + print_uint(PRINT_ANY, "qlen", " %" PRIu64 "p", q.qlen); + print_uint(PRINT_FP, NULL, " requeues %" PRIu64, q.requeues); } if (xstats) -- 2.14.3 (Apple Git-98)