From patchwork Tue Feb 24 21:24:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hagen Paul Pfeifer X-Patchwork-Id: 443187 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6AE2B1400DD for ; Wed, 25 Feb 2015 08:25:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752519AbbBXVZc (ORCPT ); Tue, 24 Feb 2015 16:25:32 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:41533 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751682AbbBXVZb (ORCPT ); Tue, 24 Feb 2015 16:25:31 -0500 Received: by wghl18 with SMTP id l18so8050839wgh.8 for ; Tue, 24 Feb 2015 13:25:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=z/Wh5vSVL2mGMG1dOqgdeO6rd1WNiITmSK3r6rjF8Xc=; b=mKJcdQGqKy8bV6QR5Z2yPepSCuFWh5QOgDdCo0h+ggiEMIlbY55x3+lwGsHAruQnE6 ckeztEPsyajsEb7qUa4WXn99NOTaoSr9muOPweUzsFWDGMk52Ct94rFNuFsvgFwwYFhO vZ86CqH2aSqI2w+r3cDM7cbGCCbu/a3v1Z2c9Lpt0xED86RXTLCaqwDV0FNOtNjKxa45 OkPWzaEArWjl8+WR7cvvQ8aeRGPlkhqrNAhSdqVIvbMYRITSR/myNATrnnzY0nhx1aQq MTCQB7gzrQ/NX+m5tuB8339QRY1sjCc4MDg/HK8a116naJZGjSEtnq0vCkWwvPYc/yZc JMdQ== X-Gm-Message-State: ALoCoQlLSbA3sUBiWXZKV0gSesWfyDXIiZ4tSYAwHrny2z/xso4pVGob0jGqEr3JqH5bfYbsq3a6 X-Received: by 10.194.122.233 with SMTP id lv9mr35667668wjb.95.1424813130554; Tue, 24 Feb 2015 13:25:30 -0800 (PST) Received: from virgo.weltnetz.local ([95.91.239.53]) by mx.google.com with ESMTPSA id fu1sm22226096wic.2.2015.02.24.13.25.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Feb 2015 13:25:29 -0800 (PST) From: Hagen Paul Pfeifer To: netdev@vger.kernel.org Cc: Stephen Hemminger , Hagen Paul Pfeifer Subject: [PATCH iproute2] ss: group DCTCP socket statistics Date: Tue, 24 Feb 2015 22:24:51 +0100 Message-Id: <1424813091-5750-1-git-send-email-hagen@jauu.net> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Keep ss output consistent and format DCTCP socket statistics similar to skmen and timer where a group of logical values are grouped by brackets. This makes parser scripts *and* humans more happy. Current output of 'ss -inetm dst :80': ESTAB 0 0 192.168.11.14:55511 173.194.66.189:443 timer:(keepalive,14sec,0) uid:1000 ino:428768 sk:ffff88020ceb5b00 <-> skmem:(r0,rb372480,t0,tb87040,f0,w0,o0,bl0) ts sack wscale:7,7 rto:250 rtt:49.225/20.837 ato:40 mss:1408 cwnd:10 ce_state 23 alpha 23 ab_ecn 23 ab_tot 23 send 2.3Mbps lastsnd:121026 lastrcv:121026 lastack:30850 pacing_rate 4.6Mbps retrans:0/2 rcv_rtt:40.416 rcv_space:2920 New grouped output: ESTAB 0 0 192.168.11.14:55511 173.194.66.189:443 timer:(keepalive,14sec,0) uid:1000 ino:428768 sk:ffff88020ceb5b00 <-> skmem:(r0,rb372480,t0,tb87040,f0,w0,o0,bl0) ts sack wscale:7,7 rto:250 rtt:49.225/20.837 ato:40 mss:1408 cwnd:10 dctcp(ce_state:23,alpha:23,ab_ecn:23,ab_tot:23) send 2.3Mbps lastsnd:121026 lastrcv:121026 lastack:30850 pacing_rate 4.6Mbps retrans:0/2 rcv_rtt:40.416 rcv_space:2920 Cc: Stephen Hemminger Acked-by: Daniel Borkmann Acked-by: Florian Westphal Signed-off-by: Hagen Paul Pfeifer --- misc/ss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 2678033..a2319d9 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -1680,11 +1680,11 @@ static void tcp_stats_print(struct tcpstat *s) if (s->dctcp && s->dctcp->enabled) { struct dctcpstat *dctcp = s->dctcp; - printf(" ce_state %u alpha %u ab_ecn %u ab_tot %u", + printf("dctcp:(ce_state:%u,alpha:%u,ab_ecn:%u,ab_tot:%u)", dctcp->ce_state, dctcp->alpha, dctcp->ab_ecn, dctcp->ab_tot); } else if (s->dctcp) { - printf(" fallback_mode"); + printf("dctcp:fallback_mode"); } if (s->send_bps)