From patchwork Thu Aug 8 14:18:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 11084237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1961814E5 for ; Thu, 8 Aug 2019 14:19:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0767928644 for ; Thu, 8 Aug 2019 14:19:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFA5128B1C; Thu, 8 Aug 2019 14:19:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAAA628A0A for ; Thu, 8 Aug 2019 14:19:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403813AbfHHOTD (ORCPT ); Thu, 8 Aug 2019 10:19:03 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:32889 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389561AbfHHOTD (ORCPT ); Thu, 8 Aug 2019 10:19:03 -0400 Received: by mail-wr1-f67.google.com with SMTP id n9so95235154wru.0 for ; Thu, 08 Aug 2019 07:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=QvRbnWf/C+Bh/eFmk5hfokHipZpa8Htx7tzaKSp4u3A=; b=rrSo1UeVAmSDYJ0Vx+Uv7nTikTosvE1DtpdiOhQmTjOZaFZPm9ArzjYnPF8BZ63CqX NFpGxal9fDQbCnHtw07IuR19RwIUL4K5rOiRX3hYFIRKrHZjfZPo7ZLeToBi+XKor1Dz GGDH7RodzYYF9Dff+N3U2z6ekeNBTMkkQX3IvSfFLjOV3syaIxRAkCdm4ZxXrLP+pLvZ ae0sRhmGnlaWs5Lz/yrVrsFPdGedyxcvkOawCeRajgk0hz+cPLSmqkJ0HJRUmx1g2sEv MM1QziQoCOinCSaHR9lyQ7vp3vmzmiUov7N5WtZW9Pu2aeywsmYqH2iQN1Lzvztjnulh /BhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=QvRbnWf/C+Bh/eFmk5hfokHipZpa8Htx7tzaKSp4u3A=; b=KWWztxHjkavFATguF6tTKuWqVFaDaGVExIWn+7xaeu3A6gYqSIx6QKqYwyLj/GEGej mvhFLE3pTPpL+f1ayx3HNtg5c1LpLrjKRmtH5Divo4yOlfu7OxCc5cq7x7hAHkCDqXeb Thq5x0fV0OC0KI+vt6+Sq/VO5RZjEqkKcl0i3xeAXqh7L1TC4WDHiyrE/89Sj4Somdnx 8+gezQBS7NMb9RpI2owfZkMWbOQqU26quTmEm2TpuU++dGtp3nkkZGzbUvgqkhBvM1pD CqbShsp2BqRqXEYf5v+dyPeXW77Np4prwUwJPYhKZ9SNR2X9t/YECA51df+x7MGXzUxG zWOg== X-Gm-Message-State: APjAAAXzK6TaGUcU4aL+wGjxUH3F4XG568kHMOQ9bWqWCvT6Tly7ytrW jinIc638boY2Qnk4udps8YDW/ZYd X-Google-Smtp-Source: APXvYqwO2+4YR9bk01BitvaXjHgEzXnQqkpFtnVppcbzcpvr6yIGujg/wA6WqrAND1wciG7pkMoSVQ== X-Received: by 2002:adf:d4cc:: with SMTP id w12mr17834763wrk.121.1565273940490; Thu, 08 Aug 2019 07:19:00 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a81sm3383902wmh.3.2019.08.08.07.18.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 07:18:59 -0700 (PDT) Date: Thu, 08 Aug 2019 07:18:59 -0700 (PDT) X-Google-Original-Date: Thu, 08 Aug 2019 14:18:52 GMT Message-Id: <38b53da31f174892b564564e0a380c0a154c8f88.1565273938.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v2 1/7] trace2: cleanup column alignment in perf target format Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Hostetler Truncate/elide very long "filename:linenumber" field. Truncate region and data "category" field if necessary. Adjust overall column widths. Signed-off-by: Jeff Hostetler --- trace2/tr2_tgt_perf.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c index ea0cbbe13e..4a9d99218b 100644 --- a/trace2/tr2_tgt_perf.c +++ b/trace2/tr2_tgt_perf.c @@ -21,10 +21,10 @@ static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0 }; */ static int tr2env_perf_be_brief; -#define TR2FMT_PERF_FL_WIDTH (50) +#define TR2FMT_PERF_FL_WIDTH (28) #define TR2FMT_PERF_MAX_EVENT_NAME (12) -#define TR2FMT_PERF_REPO_WIDTH (4) -#define TR2FMT_PERF_CATEGORY_WIDTH (10) +#define TR2FMT_PERF_REPO_WIDTH (3) +#define TR2FMT_PERF_CATEGORY_WIDTH (12) #define TR2_DOTS_BUFFER_SIZE (100) #define TR2_INDENT (2) @@ -79,17 +79,36 @@ static void perf_fmt_prepare(const char *event_name, if (!tr2env_perf_be_brief) { struct tr2_tbuf tb_now; + size_t fl_end_col; tr2_tbuf_local_time(&tb_now); strbuf_addstr(buf, tb_now.buf); strbuf_addch(buf, ' '); - if (file && *file) - strbuf_addf(buf, "%s:%d ", file, line); - while (buf->len < TR2FMT_PERF_FL_WIDTH) + fl_end_col = buf->len + TR2FMT_PERF_FL_WIDTH; + + if (file && *file) { + struct strbuf buf_fl = STRBUF_INIT; + + strbuf_addf(&buf_fl, "%s:%d", file, line); + + if (buf_fl.len <= TR2FMT_PERF_FL_WIDTH) + strbuf_addbuf(buf, &buf_fl); + else { + size_t avail = TR2FMT_PERF_FL_WIDTH - 3; + strbuf_addstr(buf, "..."); + strbuf_add(buf, + &buf_fl.buf[buf_fl.len - avail], + avail); + } + + strbuf_release(&buf_fl); + } + + while (buf->len < fl_end_col) strbuf_addch(buf, ' '); - strbuf_addstr(buf, "| "); + strbuf_addstr(buf, " | "); } strbuf_addf(buf, "d%d | ", tr2_sid_depth()); @@ -102,7 +121,7 @@ static void perf_fmt_prepare(const char *event_name, strbuf_addf(buf, "r%d ", repo->trace2_repo_id); while (buf->len < len) strbuf_addch(buf, ' '); - strbuf_addstr(buf, "| "); + strbuf_addstr(buf, " | "); if (p_us_elapsed_absolute) strbuf_addf(buf, "%9.6f | ", @@ -116,8 +135,8 @@ static void perf_fmt_prepare(const char *event_name, else strbuf_addf(buf, "%9s | ", " "); - strbuf_addf(buf, "%-*s | ", TR2FMT_PERF_CATEGORY_WIDTH, - (category ? category : "")); + strbuf_addf(buf, "%-*.*s | ", TR2FMT_PERF_CATEGORY_WIDTH, + TR2FMT_PERF_CATEGORY_WIDTH, (category ? category : "")); if (ctx->nr_open_regions > 0) { int len_indent = TR2_INDENT_LENGTH(ctx); From patchwork Thu Aug 8 14:19:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 11084251 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17C541709 for ; Thu, 8 Aug 2019 14:19:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07EDA28644 for ; Thu, 8 Aug 2019 14:19:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F09DB28B1C; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D8AD28644 for ; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403832AbfHHOTE (ORCPT ); Thu, 8 Aug 2019 10:19:04 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36744 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732438AbfHHOTD (ORCPT ); Thu, 8 Aug 2019 10:19:03 -0400 Received: by mail-wr1-f67.google.com with SMTP id r3so1377374wrt.3 for ; Thu, 08 Aug 2019 07:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=qactH6NGLKS36jenwYSX3VNJA3yZ7TcKZEALDn+R0jQ=; b=Wt6mX97G8c137tPQm5ZzGrfoLns0p7TsgUMUwB/CeKRji/wz1btyAdZyjI+R5fWEi2 tGNoLJHpqcrrGUQv167B1jXuL/5xbTv2xFlL4nf5Wj6huGQeuDXWxF/4qzHXo9VeZMHe cLbvaMWbzjOcz1+agnj2nmdhTgKyehFpwTYDVWWOgHojaxi8k/j1c9pmyrrO5rKVt6Q1 8Gy4e/BKnapruGxq6cRemdDVFVd8lUcCB/3F5bs72WYNsrrGvfGVd28GdSwhDSCuiyVT YQVjMTiUEqzA+27D2qgjVxp1A0h0J+WUxx/ikS4oXZts5Ey2THleC8+rb74wnE994Mdn buYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=qactH6NGLKS36jenwYSX3VNJA3yZ7TcKZEALDn+R0jQ=; b=HV1xahshX/gsmTlfceSjE2qjRr/7XEiyhm0VPDVV2WMFGZoDdcqowrasfAE7739Z4t IP92mDySfz64hp0N853l8niNB8R0mzq1e944WP/nO+iEqcc+/xctGfH6VsbgBhcQWzPe FUC6s/+e9U8uspDU/dSmFPLEHWfrQJCN8LhxS1RLpaS4fz9EEmFRmywPJy2phU/hCv9v ssJGfIkJ/z15q3ObUKl/EhHTqaLhNElVvL/a4auIDD7cqNN5WyO7HsHnG9K9JCkr4p3O BOxFqZArlMJJyhg4tTuJjW//qsRQPrhnC2entQsNYlqCH062fwj1dSBLdYwLzeA5LG1S ha9A== X-Gm-Message-State: APjAAAULDdbL1WLmJgoADrheIq3usi4gF5koF24uOLdF0dnRvhv0P0Ue snQA7hWcmUDbaJ7fDwzjUqRqOfkx X-Google-Smtp-Source: APXvYqwFIXJtfl2N7DqqHmFY3Y6DWMvKmal9oM7gBR1yMQUhp+AzcH6L+HWZacvbey4LMgfYvARgEQ== X-Received: by 2002:a5d:664a:: with SMTP id f10mr2825941wrw.90.1565273941221; Thu, 08 Aug 2019 07:19:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s25sm1746784wmc.21.2019.08.08.07.19.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 07:19:00 -0700 (PDT) Date: Thu, 08 Aug 2019 07:19:00 -0700 (PDT) X-Google-Original-Date: Thu, 08 Aug 2019 14:18:53 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v2 2/7] trace2: trim whitespace in region messages in perf target format Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Hostetler Avoid unecessary trailing whitespace in "region_enter" and "region_leave" messages in perf target format. Signed-off-by: Jeff Hostetler --- trace2/tr2_tgt_perf.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c index 4a9d99218b..fb845cb627 100644 --- a/trace2/tr2_tgt_perf.c +++ b/trace2/tr2_tgt_perf.c @@ -452,8 +452,11 @@ static void fn_region_enter_printf_va_fl(const char *file, int line, struct strbuf buf_payload = STRBUF_INIT; if (label) - strbuf_addf(&buf_payload, "label:%s ", label); - maybe_append_string_va(&buf_payload, fmt, ap); + strbuf_addf(&buf_payload, "label:%s", label); + if (fmt && *fmt) { + strbuf_addch(&buf_payload, ' '); + maybe_append_string_va(&buf_payload, fmt, ap); + } perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute, NULL, category, &buf_payload); @@ -469,8 +472,11 @@ static void fn_region_leave_printf_va_fl( struct strbuf buf_payload = STRBUF_INIT; if (label) - strbuf_addf(&buf_payload, "label:%s ", label); - maybe_append_string_va(&buf_payload, fmt, ap); + strbuf_addf(&buf_payload, "label:%s", label); + if (fmt && *fmt) { + strbuf_addch(&buf_payload, ' ' ); + maybe_append_string_va(&buf_payload, fmt, ap); + } perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute, &us_elapsed_region, category, &buf_payload); From patchwork Thu Aug 8 14:19:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 11084239 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ABF511850 for ; Thu, 8 Aug 2019 14:19:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A47E28644 for ; Thu, 8 Aug 2019 14:19:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8ED4828B1C; Thu, 8 Aug 2019 14:19:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31FE928644 for ; Thu, 8 Aug 2019 14:19:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403835AbfHHOTF (ORCPT ); Thu, 8 Aug 2019 10:19:05 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39032 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733035AbfHHOTD (ORCPT ); Thu, 8 Aug 2019 10:19:03 -0400 Received: by mail-wr1-f67.google.com with SMTP id t16so4990219wra.6 for ; Thu, 08 Aug 2019 07:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=AMRj4RdGeKffECVj5c+t5qwJAsKJ92hhns5QybcLZDU=; b=lF5mG+5xuWlFoX3rQWR7r1F/VKcYipToTtei/V17LBhjFHaOZeXJ/9fuKtJaXnMoUg u6Fwi453zPLbFWTt/hpCmuFvbhgGPv6HTocpIsTwQdKfP/impScQznrN7fVuZ0gPzZj5 DyojeKGxppN44C7d7fu2QmSim1SgN7fc9pSgI1rLhX4gKSwCf4eZKokCwRomcoGr7lVC a0mnwdsY/8H7F3zbH5kEVV82YvU+jXqF64tKUBhns3Y90oXRtZZSPToqzV12uY0PuPPh IUVYV0PXXQANxCFk58jspFQsoUvg3qWowSvx6uHdUBqLSHWz3vDilZLrU1MxjRvVL+Hk nmXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=AMRj4RdGeKffECVj5c+t5qwJAsKJ92hhns5QybcLZDU=; b=ptyvVCqaMk7j/4URlvm7sYHKsu2Gelh6bZ9hxrsXP/ES3CzhVaxsi1IeACXUuv1a1M 4Jp+Ic9s26N6hR6x2ESrDeAA2XvEUAGlbxBzgMjddF93YBL+RJgixdt3LHywsdh9N9Io luKho0WUB1U8KAaekywuv6sl4A7Pc+v6Fw8Im+Q8pshqBtKMSw2hH3VSaDcjEJzRA4Ro XLXkxZ/AyP3WrQLEt2/FVc3OleraiFD633Pseyl2gGQGT5WANBJKO53c2UKI3xZA9lGr mKRsUvLl7EdEOQ1sQriBXMaCzWpNSLP+OOVJwyWSXRsYHWzDL7f2287e5FLIkhdqetrP c7og== X-Gm-Message-State: APjAAAUZqcNjGV0rG4or0wAyVSn4Y1vTa250CMSV0Dq8m+ZjEdM5s4xL MBDHUUCQpZ41j4bj545noEBdCOo3 X-Google-Smtp-Source: APXvYqz5B3w2EZonxL364BtOQVBKRcf9tty0Wwz88LMJBF4UOM5S/aVqSm0PuI+O4QpmWov5qQaw0Q== X-Received: by 2002:a5d:4e06:: with SMTP id p6mr17940976wrt.336.1565273941970; Thu, 08 Aug 2019 07:19:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a19sm9895585wra.2.2019.08.08.07.19.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 07:19:01 -0700 (PDT) Date: Thu, 08 Aug 2019 07:19:01 -0700 (PDT) X-Google-Original-Date: Thu, 08 Aug 2019 14:18:54 GMT Message-Id: <09dff12a7dfe2219feab85b3fe611aa5c4196375.1565273938.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v2 3/7] trace2: remove dead code in maybe_add_string_va() Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Hostetler Remove an unnecessary "if" block in maybe_add_string_va(). Commit "ad006fe419e trace2: NULL is not allowed for va_list" changed "if (fmt && *fmt && ap)" to just "if (fmt && *fmt)" because it isn't safe to treat 'ap' as a pointer. This made the "if" block following it unnecessary. Signed-off-by: Jeff Hostetler --- trace2/tr2_tgt_event.c | 5 ----- trace2/tr2_tgt_normal.c | 5 ----- trace2/tr2_tgt_perf.c | 5 ----- 3 files changed, 15 deletions(-) diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c index c2852d1bd2..9bcac20d1b 100644 --- a/trace2/tr2_tgt_event.c +++ b/trace2/tr2_tgt_event.c @@ -205,11 +205,6 @@ static void maybe_add_string_va(struct json_writer *jw, const char *field_name, strbuf_release(&buf); return; } - - if (fmt && *fmt) { - jw_object_string(jw, field_name, fmt); - return; - } } static void fn_error_va_fl(const char *file, int line, const char *fmt, diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 00b116d797..47a1882557 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -135,11 +135,6 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt, va_end(copy_ap); return; } - - if (fmt && *fmt) { - strbuf_addstr(buf, fmt); - return; - } } static void fn_error_va_fl(const char *file, int line, const char *fmt, diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c index fb845cb627..8e52395de2 100644 --- a/trace2/tr2_tgt_perf.c +++ b/trace2/tr2_tgt_perf.c @@ -239,11 +239,6 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt, va_end(copy_ap); return; } - - if (fmt && *fmt) { - strbuf_addstr(buf, fmt); - return; - } } static void fn_error_va_fl(const char *file, int line, const char *fmt, From patchwork Thu Aug 8 14:19:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 11084249 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 826D214E5 for ; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7190228644 for ; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65EC128B1C; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11DA028644 for ; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403855AbfHHOTH (ORCPT ); Thu, 8 Aug 2019 10:19:07 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:35147 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403816AbfHHOTF (ORCPT ); Thu, 8 Aug 2019 10:19:05 -0400 Received: by mail-wr1-f65.google.com with SMTP id k2so9265200wrq.2 for ; Thu, 08 Aug 2019 07:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=DFKO2Y6RdYqqFC92luOo3NuQfAXk9PB9nYMaKON8O0M=; b=MVj71Ba7jiaYLwWL8b/i3H/fjfK5aj2ARGxyi1HphMhD18Z7UUAWBYAf0Bg//2eMx2 b1gob+z7/KmwhfVy1AhVI5f1pPgwVMM61ZHwV1zFPl2sEJu+x/3Bfvgr15aZwAJiwmAG X3PJjUBb5LKrk3JwZYVJf4dyNXDbotmrt2lNdwZP0QBy9UIvB2MmY85/gdurGR9nBlLc jlxEgiqynUv3RZTBEx+jWG5ur3K3o+aMfYP107tyrCPQRj5YY9jafs7HpEgzBAf9Yynx /IHHobvRcxKCGHai4IZokRbq7shhFB0a5Uh+MFa+MbSo70cyrsYzSYZX9UV/XYtkW2ue BJtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=DFKO2Y6RdYqqFC92luOo3NuQfAXk9PB9nYMaKON8O0M=; b=m29dGsXlUafnbT4BirVDOJQZjveAXZKbFSR4K7cwGoGs0r+3KxQv7AxoddI/U7pMdu O2CRC+q5aX9cI7lFNDmUrSMsXKeuoF1+2N+CbqRSPjVAJ9caiu0gG1vMCauy3y+01bDp ZCbuTfS9ymSNVBiWXpnJFr1iJEQNAvm6eedSzVHFBhCVZiWT0GC57oWzBubXCIPdSPik J/1GTIpr3MJ8QZkOOEtYOOW648BFGODhNRSxqhgJpFHa6SS2kcP5JXZQrs8SMUz5AbJw mdA5WXE4FesC0dTKhBLjY0pZH/nlGs7q+Y7hp5MBhIHFNu0+4Azo8lF5eLeLGbGpQPVX BhUQ== X-Gm-Message-State: APjAAAXcugbpfEPCXNQdr7SfeR6tAy9/mAol6GJc4M64g4+Iuf7UN6vV EkG1YW/bnP77A8LuC2ZQowYbDDJp X-Google-Smtp-Source: APXvYqzm3GrdJesA5Gs6TO886SJxeoP6h2kU1WmxC2YVqOJBSdoa4Ale/7qOD/HUw3YZ6hTXPbXqSw== X-Received: by 2002:a5d:4e90:: with SMTP id e16mr17236927wru.339.1565273942694; Thu, 08 Aug 2019 07:19:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l2sm2273125wmj.4.2019.08.08.07.19.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 07:19:02 -0700 (PDT) Date: Thu, 08 Aug 2019 07:19:02 -0700 (PDT) X-Google-Original-Date: Thu, 08 Aug 2019 14:18:55 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v2 4/7] trace2: trim trailing whitespace in normal format error message Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Hostetler Avoid creating unnecessary trailing whitespace in normal target format error messages when the message is omitted. Signed-off-by: Jeff Hostetler --- trace2/tr2_tgt_normal.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 47a1882557..213724d5cb 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -142,8 +142,11 @@ static void fn_error_va_fl(const char *file, int line, const char *fmt, { struct strbuf buf_payload = STRBUF_INIT; - strbuf_addstr(&buf_payload, "error "); - maybe_append_string_va(&buf_payload, fmt, ap); + strbuf_addstr(&buf_payload, "error"); + if (fmt && *fmt) { + strbuf_addch(&buf_payload, ' '); + maybe_append_string_va(&buf_payload, fmt, ap); + } normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } From patchwork Thu Aug 8 14:19:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 11084245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F0441709 for ; Thu, 8 Aug 2019 14:19:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EB3928644 for ; Thu, 8 Aug 2019 14:19:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 033DE28B1C; Thu, 8 Aug 2019 14:19:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC97228644 for ; Thu, 8 Aug 2019 14:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403859AbfHHOTI (ORCPT ); Thu, 8 Aug 2019 10:19:08 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:33450 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403825AbfHHOTF (ORCPT ); Thu, 8 Aug 2019 10:19:05 -0400 Received: by mail-wm1-f68.google.com with SMTP id p77so4093592wme.0 for ; Thu, 08 Aug 2019 07:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=zGh8KIuph3vSSw62JCpgp0Zk+YDdXpBALb4SPAp011k=; b=Pe6kHhvmmeRBApfLc3ZE5r0zZNuIuSvo1TfhCQ2Bo6G/VXcyMYOwiBg+d7wfPlBXdN 98p9HjMTN4vn5FkSPkviSQ8ZWa4YgXAGNbm22WXaRpDrCZbcoLeX3jaa961bly5pUD8Z DT5PCnZy6xAvMHltu0dri5wbdHk6J05qEiwIT39VT6R6W3mKIUu/Aa+YTBEy9O4EJZSI M5FMt4xcN55OcXCVPWe9RSiI17oztoGH58dBWty7llD9l5jGMe0BcLioHzW5fY+JF8/J Isvxmo3uo0IqPXMG4d+hh85w0wzqw0tqbW9hbGtE1SPDDdOP1EWoWpYl7NtcNOtCvTvf 4OIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=zGh8KIuph3vSSw62JCpgp0Zk+YDdXpBALb4SPAp011k=; b=IWzDV5wV2JDanR4Zf6xelLFcaJnuvMA49nPBcP6MMTNw6GJaetWwObwORTPcv3oL6j RYdsrg01IeiArfZn247Kq9SjEdnOlP6XNt6/Ja1xgE6RP2NYofNVclA/mlWu7mpD2eiI Jy5P5dYxC5rs4qU3jWLj0xqDCjNeYxDPzJg87SizAfbuooFFrT2lwXAQ7QPQ0vpPc6KF 2IyHFBC0sR+fOisz+XEB8hlmhz2+kc5XkLyv5zo3Mos2GZcIXjcte+MP4vNBZhRzSt82 R5piteJnhdd9Ex2dRSkSAQm7CO3Vz1l6jb/HDDqBSnlH4tzNYfkGJm7Pmb+N47iOvx/h 01Tw== X-Gm-Message-State: APjAAAUVtSYiNci9qI2z1NkxgjuiEt0MvH+Tra10VWFtRfjidfi/tUaQ KJKWEwCqeb1UWioH4e2mZonNIii7 X-Google-Smtp-Source: APXvYqxC2BDRZnxV5EyT/v8NACkwG3jJcZa8hHtpvfaII5ugI9aPhI8KK6T1KPKPeJDk0+JEnTTY6A== X-Received: by 2002:a1c:c742:: with SMTP id x63mr5011579wmf.0.1565273943299; Thu, 08 Aug 2019 07:19:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a81sm3384120wmh.3.2019.08.08.07.19.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 07:19:02 -0700 (PDT) Date: Thu, 08 Aug 2019 07:19:02 -0700 (PDT) X-Google-Original-Date: Thu, 08 Aug 2019 14:18:56 GMT Message-Id: <5059776248b6686faaff37c97aa63d0212579cd8.1565273938.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v2 5/7] quote: add sq_quote_argv_pretty_ltrim Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Hostetler Create version of sq_quote_argv_pretty() that does not insert a leading space before argv[0]. Signed-off-by: Jeff Hostetler --- quote.c | 11 +++++++++++ quote.h | 1 + 2 files changed, 12 insertions(+) diff --git a/quote.c b/quote.c index 7f2aa6faa4..7cad8798ac 100644 --- a/quote.c +++ b/quote.c @@ -94,6 +94,17 @@ void sq_quote_argv_pretty(struct strbuf *dst, const char **argv) } } +void sq_quote_argv_pretty_ltrim(struct strbuf *dst, const char **argv) +{ + int i; + + for (i = 0; argv[i]; i++) { + if (i > 0) + strbuf_addch(dst, ' '); + sq_quote_buf_pretty(dst, argv[i]); + } +} + static char *sq_dequote_step(char *arg, char **next) { char *dst = arg; diff --git a/quote.h b/quote.h index fb08dc085c..3b3d041a61 100644 --- a/quote.h +++ b/quote.h @@ -40,6 +40,7 @@ void sq_quotef(struct strbuf *, const char *fmt, ...); */ void sq_quote_buf_pretty(struct strbuf *, const char *src); void sq_quote_argv_pretty(struct strbuf *, const char **argv); +void sq_quote_argv_pretty_ltrim(struct strbuf *, const char **argv); /* This unwraps what sq_quote() produces in place, but returns * NULL if the input does not look like what sq_quote would have From patchwork Thu Aug 8 14:19:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 11084243 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C104714E5 for ; Thu, 8 Aug 2019 14:19:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE8D928A0A for ; Thu, 8 Aug 2019 14:19:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A337228B1C; Thu, 8 Aug 2019 14:19:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42ADC28644 for ; Thu, 8 Aug 2019 14:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403843AbfHHOTH (ORCPT ); Thu, 8 Aug 2019 10:19:07 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:32895 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403831AbfHHOTF (ORCPT ); Thu, 8 Aug 2019 10:19:05 -0400 Received: by mail-wr1-f66.google.com with SMTP id n9so95235318wru.0 for ; Thu, 08 Aug 2019 07:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=IVgpJQrq1SvWAoMKotTroh8WIIygwQ+5IhrXiCkd4F4=; b=BF1bhn+PVUEY2zYmHFri+EqHWWuyxUuVxYeTKE/VjId9WO5UKORBRJD83oXtlgHs4w 87XOJ/Q9s3RHA9e7ktQwANbOcULKCXaJ2t49VWCkcWYohb3mBmNAq4dMwn0clBTWSSWz 2oyks1pEVrugNSjIs85RnraqTSeGUJymRQjl4ojGUTgmu73p2KH94tLpq1d3F4v4+Efi tzQL6sQwQVpNN8N913UavwLwkKz8csHKR93d9YMxQe6USeu0Y9CSMglFmuwMXbVO6Dzf I4iR/BQGg8R0jeP2MVuJ69nqwd6qr4PzXD2TQYFqphJ4EjmpYy7qL1TVCiFd6PsbZpxZ /CQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=IVgpJQrq1SvWAoMKotTroh8WIIygwQ+5IhrXiCkd4F4=; b=Wqmfl4r3yot3ThdD7qKzUJ2m71EU4I+hw7dsSXCjsXUVpgUJRBlFNfoVktFtPRMnuH +Zc4d0WHGnM3jWzAnMMTz93BJGsqKNQQEXBxclzjeObTQh3fRB1HScuuaY8RwaWuPDq2 FM5ev8/UD5kEJxLNGEvQIZS9M+LS6Qio0NGj4Wo8Mvo3bOLi7ZU3dcuL7KJVB/r+6u/0 pwt1UyZV4fqE/nARAlMOkie+uI8+0y/YmBmYtLxd/8horMaeldKVpCG+hWoMWklQuD3r ioz6kjLb7wPzjG0W5ht7oYD3FtiBVBrX87pnSBk5igEzRk1t2M8pxUCUw1S0/kU3L5Ua TaSA== X-Gm-Message-State: APjAAAVuAIuiyU167Xy7F1g1AeIWGAD1HkAa1daJoASY9UYdDbZkJeD9 NWddsBVMiQ0sdGp6jZ1CEyst5Ulb X-Google-Smtp-Source: APXvYqwWLa9iinBWPk74bWpQDTI4+bEp28h11ZUVwUiQxBbJiA+Iyp440pADIuS6NenhbSHxvrUmIA== X-Received: by 2002:a5d:4206:: with SMTP id n6mr17404535wrq.110.1565273943922; Thu, 08 Aug 2019 07:19:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y16sm202618587wrg.85.2019.08.08.07.19.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 07:19:03 -0700 (PDT) Date: Thu, 08 Aug 2019 07:19:03 -0700 (PDT) X-Google-Original-Date: Thu, 08 Aug 2019 14:18:57 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v2 6/7] trace2: cleanup whitespace in normal format Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Hostetler Make use of new sq_quote_argv_pretty_ltrim() to normalize how we handle leading whitespace in normal format messages. Signed-off-by: Jeff Hostetler --- trace2/tr2_tgt_normal.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 213724d5cb..5de2f8214c 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -87,7 +87,7 @@ static void fn_start_fl(const char *file, int line, struct strbuf buf_payload = STRBUF_INIT; strbuf_addstr(&buf_payload, "start "); - sq_quote_argv_pretty(&buf_payload, argv); + sq_quote_argv_pretty_ltrim(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } @@ -186,8 +186,8 @@ static void fn_alias_fl(const char *file, int line, const char *alias, { struct strbuf buf_payload = STRBUF_INIT; - strbuf_addf(&buf_payload, "alias %s ->", alias); - sq_quote_argv_pretty(&buf_payload, argv); + strbuf_addf(&buf_payload, "alias %s -> ", alias); + sq_quote_argv_pretty_ltrim(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } @@ -198,12 +198,12 @@ static void fn_child_start_fl(const char *file, int line, { struct strbuf buf_payload = STRBUF_INIT; - strbuf_addf(&buf_payload, "child_start[%d] ", cmd->trace2_child_id); + strbuf_addf(&buf_payload, "child_start[%d]", cmd->trace2_child_id); if (cmd->dir) { strbuf_addstr(&buf_payload, " cd"); sq_quote_buf_pretty(&buf_payload, cmd->dir); - strbuf_addstr(&buf_payload, "; "); + strbuf_addstr(&buf_payload, ";"); } /* @@ -211,9 +211,10 @@ static void fn_child_start_fl(const char *file, int line, * See trace_add_env() in run-command.c as used by original trace.c */ + strbuf_addch(&buf_payload, ' '); if (cmd->git_cmd) - strbuf_addstr(&buf_payload, "git"); - sq_quote_argv_pretty(&buf_payload, cmd->argv); + strbuf_addstr(&buf_payload, "git "); + sq_quote_argv_pretty_ltrim(&buf_payload, cmd->argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); @@ -238,9 +239,11 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute, struct strbuf buf_payload = STRBUF_INIT; strbuf_addf(&buf_payload, "exec[%d] ", exec_id); - if (exe) + if (exe) { strbuf_addstr(&buf_payload, exe); - sq_quote_argv_pretty(&buf_payload, argv); + strbuf_addch(&buf_payload, ' '); + } + sq_quote_argv_pretty_ltrim(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } From patchwork Thu Aug 8 14:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 11084247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC5C814F6 for ; Thu, 8 Aug 2019 14:19:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9EB028644 for ; Thu, 8 Aug 2019 14:19:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AEF328B1C; Thu, 8 Aug 2019 14:19:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30AC828644 for ; Thu, 8 Aug 2019 14:19:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403866AbfHHOTI (ORCPT ); Thu, 8 Aug 2019 10:19:08 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:46305 "EHLO mail-wr1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733035AbfHHOTG (ORCPT ); Thu, 8 Aug 2019 10:19:06 -0400 Received: by mail-wr1-f52.google.com with SMTP id z1so95121618wru.13 for ; Thu, 08 Aug 2019 07:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=jEr/cyiBkX9RelGgbKLwfxcdHoBpt/cBoxbWPZaXjSU=; b=U2psGgldsU0xJ7I0c1RvJAyil12pBp6ZwYghIddD3UUY1lx7t1ZHdAKGafXkd7gKQv 8TvA/nET9YKSN8jW5n2zPWOxvbkj0TE5n/OI/tr/yRW2ZBquK02rq8d/+fQbW3Psuvjp OEJNFogdHvt6pPjq4f+WT1BxaUpH6UdBphfstFlh8okTytCdzQaWi3SfVGnWXE/wLCPK WeZ19z+cea4UpPdMMZVtntO6/LY+0T9WCSMZ2LKraK5YxfTnHR3jvTiBmQmy53LijDSn YUGG7ohKwvUKcdm/DCC0Ssp7cGmvFIRexrYQnYoULhH/GvhT6JWOqe6ie96gJOQO0teh yEVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=jEr/cyiBkX9RelGgbKLwfxcdHoBpt/cBoxbWPZaXjSU=; b=LNfzkZO+6tZBJVuAvqEnI18sZHz/yQS3AEI999OrSShd/tU6OH5yeURdvU0ieoR4+y TFtVpuGZJ65FVtXx7ZkwCzUSvug7azSPoTHZOREaatZ6JCLQlkaGyQgU6G6DbrWpRyNM 5akyesUqD8QzTqNoVhDlWlFWgHuip8tOD/obmr397isoDxcpp0jMesuL6pjGU4Fjq1qK Ck36PLkulyYd+xuk85rjw1bA/2ym0YXoDSp9V8v/jbuCqOAaRpzFQb56OjkOtb+uCbzF 5AKHCSTTvgHeHh+nCneE1Rjj5epGZdQuKFuO4gy2rNINTDBIEy7HquaRBvgimEHK1wUO eOpg== X-Gm-Message-State: APjAAAXtxfPYuwt07HRb7ZMT0Fkmw/Y9k2g3FXRwUVKwAs0wIRQtxT1n ii+n4QpDUv+XRvN12T/lD0VhhJU+ X-Google-Smtp-Source: APXvYqwpO7fOKsNjIqxYL0IwJETaJ9cRHgUrlntj01yRV4+fHg2++XRd5bFNr0tPaOX3qwbdQxkPSw== X-Received: by 2002:adf:f204:: with SMTP id p4mr18127290wro.317.1565273944876; Thu, 08 Aug 2019 07:19:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y12sm70233505wru.30.2019.08.08.07.19.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 07:19:04 -0700 (PDT) Date: Thu, 08 Aug 2019 07:19:04 -0700 (PDT) X-Google-Original-Date: Thu, 08 Aug 2019 14:18:58 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v2 7/7] trace2: cleanup whitespace in perf format Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Hostetler Make use of new sq_quote_argv_pretty_ltrim() to normalize how we handle leading whitespace in perf format messages. Signed-off-by: Jeff Hostetler --- t/t0211-trace2-perf.sh | 4 ++-- trace2/tr2_tgt_perf.c | 31 ++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/t/t0211-trace2-perf.sh b/t/t0211-trace2-perf.sh index 2c3ad6e8c1..6ee8ee3b67 100755 --- a/t/t0211-trace2-perf.sh +++ b/t/t0211-trace2-perf.sh @@ -130,11 +130,11 @@ test_expect_success 'perf stream, child processes' ' d0|main|version|||||$V d0|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 004child test-tool trace2 001return 0 d0|main|cmd_name|||||trace2 (trace2) - d0|main|child_start||_T_ABS_|||[ch0] class:? argv: test-tool trace2 004child test-tool trace2 001return 0 + d0|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 004child test-tool trace2 001return 0] d1|main|version|||||$V d1|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 001return 0 d1|main|cmd_name|||||trace2 (trace2/trace2) - d1|main|child_start||_T_ABS_|||[ch0] class:? argv: test-tool trace2 001return 0 + d1|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 001return 0] d2|main|version|||||$V d2|main|start||_T_ABS_|||_EXE_ trace2 001return 0 d2|main|cmd_name|||||trace2 (trace2/trace2/trace2) diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c index 8e52395de2..59c03a5ed4 100644 --- a/trace2/tr2_tgt_perf.c +++ b/trace2/tr2_tgt_perf.c @@ -184,7 +184,7 @@ static void fn_start_fl(const char *file, int line, const char *event_name = "start"; struct strbuf buf_payload = STRBUF_INIT; - sq_quote_argv_pretty(&buf_payload, argv); + sq_quote_argv_pretty_ltrim(&buf_payload, argv); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload); @@ -299,8 +299,9 @@ static void fn_alias_fl(const char *file, int line, const char *alias, const char *event_name = "alias"; struct strbuf buf_payload = STRBUF_INIT; - strbuf_addf(&buf_payload, "alias:%s argv:", alias); - sq_quote_argv_pretty(&buf_payload, argv); + strbuf_addf(&buf_payload, "alias:%s argv:[", alias); + sq_quote_argv_pretty_ltrim(&buf_payload, argv); + strbuf_addch(&buf_payload, ']'); perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL, &buf_payload); @@ -329,10 +330,14 @@ static void fn_child_start_fl(const char *file, int line, sq_quote_buf_pretty(&buf_payload, cmd->dir); } - strbuf_addstr(&buf_payload, " argv:"); - if (cmd->git_cmd) - strbuf_addstr(&buf_payload, " git"); - sq_quote_argv_pretty(&buf_payload, cmd->argv); + strbuf_addstr(&buf_payload, " argv:["); + if (cmd->git_cmd) { + strbuf_addstr(&buf_payload, "git"); + if (cmd->argv[0]) + strbuf_addch(&buf_payload, ' '); + } + sq_quote_argv_pretty_ltrim(&buf_payload, cmd->argv); + strbuf_addch(&buf_payload, ']'); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload); @@ -383,10 +388,14 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute, struct strbuf buf_payload = STRBUF_INIT; strbuf_addf(&buf_payload, "id:%d ", exec_id); - strbuf_addstr(&buf_payload, "argv:"); - if (exe) - strbuf_addf(&buf_payload, " %s", exe); - sq_quote_argv_pretty(&buf_payload, argv); + strbuf_addstr(&buf_payload, "argv:["); + if (exe) { + strbuf_addstr(&buf_payload, exe); + if (argv[0]) + strbuf_addch(&buf_payload, ' '); + } + sq_quote_argv_pretty_ltrim(&buf_payload, argv); + strbuf_addch(&buf_payload, ']'); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload);