From patchwork Sun Aug 9 23:13:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Tafelmeier X-Patchwork-Id: 505499 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 A209D1402BE for ; Mon, 10 Aug 2015 09:14:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752136AbbHIXO2 (ORCPT ); Sun, 9 Aug 2015 19:14:28 -0400 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 Received: from punraz.Speedport_W_921V_1_37_000 ([79.203.93.221]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0LcSAg-1YwPyT2Uwo-00jtt7; Mon, 10 Aug 2015 01:13:35 +0200 From: Matthias Tafelmeier To: netdev@vger.kernel.org Cc: hagen@jauu.net, shemminger@osdl.org, fw@strlen.de, edumazet@google.com, daniel@iogearbox.net 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> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439162006-11421-1-git-send-email-matthias.tafelmeier@gmx.net> References: <1439162006-11421-1-git-send-email-matthias.tafelmeier@gmx.net> X-Provags-ID: V03:K0:4DRH9iYilT+cFFJxXc/wA75nzGX1wB+xlaCZeZ9nUAYDjsGlh4L XwzOJgd5qkKd7X8Hblbe4BOobVWST3ReNbeZtJMt7CYYou9WWoDnop+6I9OwGNinHfawjTA /livYdx42EF02I0KvbhNHcZ3atYCFqtxqd3+rHVwbW+WtmcFF9YWZdy1DQfPCLkkZoxrmE6 96AR64lovXchh46qkwu4A== X-UI-Out-Filterresults: notjunk:1; V01:K0:R7OBtz77H04=:bkkHjRa5rslbDKe3khUd+9 hgZ1GViboebY9DBh9VRXtYcbuOlk5T8rD2/u92hghgeE5/0V3q4YswJGThbx+exKKBvbpBwvI 6RLCkX1A+DU2O8N4XUnBd1PJZoNpcEP4wWzyE9WUS7I+dZy06l9zeJHidtTRoUYs8HFjlEyS8 sNSmYia/K5sz5V3a1MRGHyaMMSGaOZaGqNvCFBiAoQCNt84JUUmT0PKKtQDFKeFETn67jJSC6 cH4Xy6HXDb1HWabikSFvVh8ZslQv5dep5Ws5Pif3qE6ySisvHfzknmA0wvbZoUgBs+1NwOJl+ E+CN6/T2Q9x8Yprd4A+AubjexnbVzdltN/5xMZkDVSvJTFMVgiJ0z12oXg8wZqxWTTSTHik5E S6fu9lN//LqBZXpiuPji8pt3Vf3xMvIDkfXteKybdn+05uWw8W5xyBQqV0nwKfO4rZMR+geR5 pWxoGhTWhfBd95bC8tFUPN33sXn0+uljuFvSohSO62o4PzwaZcX2yMcNXhTbTaB0mreX4ukA3 nsTKM1yaOzhn+CxbdNZ4/sW654YujUKIoBWFzJDW6RJb0nXFeS+0T5ctIuzhI8ysVVpyhCI5X 1Y5dPMJbQEdIaiE5FZn9Cxl4AM3NkiK/X3QkoN44B/VfDR2byvPTUAmYtDE6owA2web+3FVyU sh7Sd/SdR8aLbDCFOEo6hC+v7T6LMJMSlyZzvOcHlrgdUEACZzJrwLAMA7ua/MIn/K1DbW9s7 7HmdseVa+iTTOeeW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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, ' ');