From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Tafelmeier Subject: [PATCH 08/10] ss: symmetrical subhandler output extension example Date: Mon, 10 Aug 2015 01:13:24 +0200 Message-ID: <1439162006-11421-9-git-send-email-matthias.tafelmeier@gmx.net> References: <1439162006-11421-1-git-send-email-matthias.tafelmeier@gmx.net> Cc: hagen@jauu.net, shemminger@osdl.org, fw@strlen.de, edumazet@google.com, daniel@iogearbox.net To: netdev@vger.kernel.org Return-path: Received: from mout.gmx.net ([212.227.15.15]:51063 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751740AbbHIXN6 (ORCPT ); Sun, 9 Aug 2015 19:13:58 -0400 In-Reply-To: <1439162006-11421-1-git-send-email-matthias.tafelmeier@gmx.net> Sender: netdev-owner@vger.kernel.org List-ID: This small sized patch shall convey the locations which have to be changed for a symmetrical output extension. Symmetrical means in this context all existing semantically related handlers in the diverse formatters (for hr and json up to now). Signed-off-by: Matthias Tafelmeier Suggested-by: Hagen Paul Pfeifer --- misc/ss_hr_fmt.c | 2 ++ misc/ss_json_fmt.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/misc/ss_hr_fmt.c b/misc/ss_hr_fmt.c index 6955ea5..40b6b7c 100644 --- a/misc/ss_hr_fmt.c +++ b/misc/ss_hr_fmt.c @@ -82,6 +82,8 @@ static void tcp_stats_hr_fmt(struct tcpstat *s) printf(" reordering:%d", s->reordering); if (s->rcv_rtt) printf(" rcv_rtt:%g", s->rcv_rtt); + if (s->rcv_space) + printf(" rcv_space:%d", s->rcv_space); CHECK_FMT_ADAPT(s->rcv_space, s, hr_handler_must_be_adapted_accordingly_when_json_fmt_is_extended); diff --git a/misc/ss_json_fmt.c b/misc/ss_json_fmt.c index f1a53cd..e80f063 100644 --- a/misc/ss_json_fmt.c +++ b/misc/ss_json_fmt.c @@ -161,7 +161,9 @@ static void tcp_stats_json_fmt(struct tcpstat *s) if (s->rcv_rtt) { printf(",\n%s\"rcv_rtt\": %g", indent1, s->rcv_rtt); } - + if (s->rcv_space) { + printf(",\n%s\"rcv_space\": %d", indent1, s->rcv_space); + } /*deal with special case */ res_json_fmt_branch(s->ss.state == SS_LISTEN, ' '); -- 1.9.1