From patchwork Mon Oct 23 16:24:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 829403 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="0qnTuMfu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yLMFs2Xc1z9t5s for ; Tue, 24 Oct 2017 03:25:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751725AbdJWQZZ (ORCPT ); Mon, 23 Oct 2017 12:25:25 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:44744 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751612AbdJWQZC (ORCPT ); Mon, 23 Oct 2017 12:25:02 -0400 Received: by mail-pg0-f66.google.com with SMTP id j3so12171108pga.1 for ; Mon, 23 Oct 2017 09:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6wuT6S31NPu1gwBuJRxr1DSCwJvcGRUP/43Cgro4IG8=; b=0qnTuMfu+eKXaGKhmttVFQi5aIRAdPI0ZoPyUKj89lD71Bxodykqb4KlmopjeQh/vX kC84zqFa/eM/f1TqSQPVU+XjlFDCNGBtN7gJ/m5z5m1khNkRntup3lZyvt75CNDS4QSD Bq9i0brUp6OOqHJMsCRxlD2rDIWqojOS098FBLYFWRVOfzUUpzcAwzpAQBI0d+R7PCcd Cpk5X8qpM7zLpzynQ0AatPB2iTfsq4zhnN9plkWvrPnxSWR81zy8w2y4QD1jMf8y2pWm hXbIjLhdX+jT2wkUgDfXixAU0zSYhZp2VIOTZ2VVnDs32u26hK4go6ge6xmw9oTqYi3S jiLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6wuT6S31NPu1gwBuJRxr1DSCwJvcGRUP/43Cgro4IG8=; b=Q7xWzFYB2syDkg2wfGtKTa7uDs1Gff/C+TPN2SkfuBinYxnCG4fYa2rvjMzyhxAo46 SK0MBHUUWFcSaWOKKSGNH9BnOat3bXqHk0HaHKjf9SJUgmv+zOsEIRYzPj/oYxpbCS6k zkB6IZGCnOGhlGfGTeiI0hDKdZ505ebXuoIC5Ycn3GzKmc4G9ddswUjurtaNO7Y0H6J8 fBr1Ik/Cqkjs2t4FI0Og+V5uxuRezj/Ac+zZ9jyy7PZa7H6nYitTxqCpO0D2wL8QQhGK DWwhDOKevWFOdLKDMyCVJ6Z3ccT56jp/By8WIrGzrqgNci3uqiX5ZooRRgLVwnD6Qnhp N2+Q== X-Gm-Message-State: AMCzsaVu6iNts0oXJOEahmPjmCyOFT6HjikFh3e6YXBhcMA35Y/eHPlo Te5wfpljM65dBXoo0V2KqUOrOQJJ X-Google-Smtp-Source: ABhQp+Rg3L6JMWQIfthFqeo9wn/qrJxsUOPSN/yWlcobVWDTKk08ISqRX+HCNqiyHL4lkIA/Z0vg1Q== X-Received: by 10.159.194.204 with SMTP id u12mr10582654plz.401.1508775901858; Mon, 23 Oct 2017 09:25:01 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id a19sm13586540pfh.30.2017.10.23.09.25.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 09:25:01 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, alexei.starovoitov@gmail.com, daniel@iogearbox.net, Quentin Monnet Subject: [PATCH net-next 08/12] tools: bpftool: add JSON output for `bpftool batch file FILE` command Date: Mon, 23 Oct 2017 09:24:12 -0700 Message-Id: <20171023162416.32753-9-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171023162416.32753-1-jakub.kicinski@netronome.com> References: <20171023162416.32753-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Quentin Monnet `bpftool batch file FILE` takes FILE as an argument and executes all the bpftool commands it finds inside (or stops if an error occurs). To obtain a consistent JSON output, create a root JSON array, then for each command create a new object containing two fields: one with the command arguments, the other with the output (which is the JSON object that the command would have produced, if called on its own). Signed-off-by: Quentin Monnet Acked-by: Daniel Borkmann --- tools/bpf/bpftool/main.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index 14bfc17cd4de..71b01bf73912 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c @@ -155,6 +155,7 @@ static int do_batch(int argc, char **argv) int n_argc; FILE *fp; int err; + int i; if (argc < 2) { err("too few parameters for batch\n"); @@ -174,6 +175,8 @@ static int do_batch(int argc, char **argv) return -1; } + if (json_output) + jsonw_start_array(json_wtr); while (fgets(buf, sizeof(buf), fp)) { if (strlen(buf) == sizeof(buf) - 1) { errno = E2BIG; @@ -197,7 +200,21 @@ static int do_batch(int argc, char **argv) if (!n_argc) continue; + if (json_output) { + jsonw_start_object(json_wtr); + jsonw_name(json_wtr, "command"); + jsonw_start_array(json_wtr); + for (i = 0; i < n_argc; i++) + jsonw_string(json_wtr, n_argv[i]); + jsonw_end_array(json_wtr); + jsonw_name(json_wtr, "output"); + } + err = cmd_select(cmds, n_argc, n_argv, do_help); + + if (json_output) + jsonw_end_object(json_wtr); + if (err) goto err_close; @@ -214,6 +231,9 @@ static int do_batch(int argc, char **argv) err_close: fclose(fp); + if (json_output) + jsonw_end_array(json_wtr); + return err; }