From patchwork Fri Aug 9 15:00:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11086701 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 04AE51398 for ; Fri, 9 Aug 2019 15:00:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7F571FF7F for ; Fri, 9 Aug 2019 15:00:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC2DD1FF87; Fri, 9 Aug 2019 15:00:57 +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 5EA1A1FF7F for ; Fri, 9 Aug 2019 15:00:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407240AbfHIPAz (ORCPT ); Fri, 9 Aug 2019 11:00:55 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36642 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726463AbfHIPAz (ORCPT ); Fri, 9 Aug 2019 11:00:55 -0400 Received: by mail-wm1-f66.google.com with SMTP id g67so5909970wme.1 for ; Fri, 09 Aug 2019 08:00:54 -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=QwSAe5Oo5LOWbXvxs27jGCMHnyDlfzkAsEjeIMDiOS1MsNz4E6plV67GrYE8/pOIBI +rUwu9ZMW9lAMaVDAujoQTLj7EY4AROqU5Drx+UGsQjDMJzsm3GGjtHvVUQL0K44rXk+ IxISQUUlILJsnBLsz4BWouNo7kfKcbnBZUeSCkp+4K2vGBir5bER4eYvWeLMJlG8tnlZ LjvCoCSf4L3dkcYYt7C+2Qb0SODHPKtRJ2IO0JXRfxjl4RfLmHEj5nnnoXKcjdTusIEw fBmEdP2ZmQOTo02AOoUm+M0LWALrqj4cQoYjMUpCHmLcJi3FudrHP2fJIEMopK8XZO9/ /6vA== 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=lKXKQo9IMwrkgIZl2E+8a5m+emZYMoMuza3EDyZwSIp/HoAMIFsbRUrYCERMpe79rh IA5zuPIfDcKya/pgqde9xHyQgeVUkiw6AXEeJ6oGqG50XBwqk9Ah8JfMvBJja2lOqomB N/qNfRub3MNJRnVrnUG3yQI5fpI+jhZe61Qw4wqaKbyablmhndmpqp4lXxYUhV60BUw+ d0Qq36Isl/ha/2hmM4DIm8ySdyWnwcod/BJ2RnPjjU8N6X/b3JAhtdZ7MLwc+BOOAve3 g/9B6E8EW+DbuOBWzrcl5atm+U0l1C6BWNjZO23O5TIoSMjWIgBamZDxT3+Sy3qRo7Wb 2/uQ== X-Gm-Message-State: APjAAAUpNKdYn1sTnxtFel2kj7Tu58qb1Xlx2jXjveCL/0E+/kqxDPnt 6YbqJXuQ0jtVYWt15Ji3LE5azE/S X-Google-Smtp-Source: APXvYqxjlfnR1ClF12K+VMT9nuBzyi/3P90oJriyTXY5VzjQF7nG37GQW52n0tOdsPrGj7YltrxPzg== X-Received: by 2002:a1c:be11:: with SMTP id o17mr11328209wmf.115.1565362853600; Fri, 09 Aug 2019 08:00:53 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n12sm5399351wmc.24.2019.08.09.08.00.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 08:00:53 -0700 (PDT) Date: Fri, 09 Aug 2019 08:00:53 -0700 (PDT) X-Google-Original-Date: Fri, 09 Aug 2019 15:00:45 GMT Message-Id: <38b53da31f174892b564564e0a380c0a154c8f88.1565362851.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v3 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 Fri Aug 9 15:00:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11086705 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 750C818A6 for ; Fri, 9 Aug 2019 15:00:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E4491FF41 for ; Fri, 9 Aug 2019 15:00:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 524121FFE5; Fri, 9 Aug 2019 15:00:58 +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 0226B1FF83 for ; Fri, 9 Aug 2019 15:00:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407250AbfHIPA5 (ORCPT ); Fri, 9 Aug 2019 11:00:57 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50400 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407234AbfHIPA4 (ORCPT ); Fri, 9 Aug 2019 11:00:56 -0400 Received: by mail-wm1-f68.google.com with SMTP id v15so6048206wml.0 for ; Fri, 09 Aug 2019 08:00:54 -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=HweQfJN6GxfwPqWD2hZ1e7jLno/8DG2cmU68LIejJff12UiDpQgouGGH6c2xgdsRET zq4QcvtnF/CnibJnGc4veOFG0ewwn1gju5ta5Wp0a/s6mZRa5YNQwTH/EK9bFzzsrado BrLOy/hc5xBPC5nagW66vObOTcsHfxOc4ArS33qvAGfRFtghc091kLxhKlz4hoUPlvJ9 uxLkMaYd5hsJ5r6gLIF2fRriTD9hrbGA/bs+4gxl+iw3rg7fbyA+maABie+BLx8hvu9x WzMn8p2q6E1izAFA41CHu9yRYI2ImBbGmqGnk343iVJ4ZPZ/ROksLF+a8FGBVW3NvXz9 3HpA== 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=WV8vSuYFiXznl2qO/+IVMmWtbeU9+bp8nxFWuSGuGi94O+TIxq+sIfMQl2iX6+Dt8+ XfIPcdaiwlKh1ZyeE2a1nrPFumotF5mE0wliSwtyeA3+PdPEc6HxJBbtJM5HaCWrMlK2 wnwhIh7AJ2Il+QKNmSOuxeixw4H1qidW0ebfhoUkQ0AgKLQlYtoqDYZoVC7fhE7Y7iA6 vjseTWEINQBeyvPAflJutROx54+GdYPrrMMPbvb1Fbh3vK8CBFNfhZErKpv+ohZpOwgv sJMksM1AWyPnhJEy5g6Ai6Ns6mYtJqSbQjLtvkYftSU1LegaX0NXiF5ZrZ23MpDbWffv s5Kw== X-Gm-Message-State: APjAAAVuTHrpOttfa7UH8Mi5mtQt+PueGrceri37YbZCgBvFNwlkpreL NgjDfA8TdCF83C8lzClN3ghW5tjf X-Google-Smtp-Source: APXvYqy03fukdQ8LKyBSbvu/LYvxBvhzkffkPYX0d35SgePAWHU4WeKeJau+MSooKXcWZxKNQuF67A== X-Received: by 2002:a7b:c651:: with SMTP id q17mr10656889wmk.136.1565362854264; Fri, 09 Aug 2019 08:00:54 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h2sm4046821wmb.28.2019.08.09.08.00.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 08:00:53 -0700 (PDT) Date: Fri, 09 Aug 2019 08:00:53 -0700 (PDT) X-Google-Original-Date: Fri, 09 Aug 2019 15:00:46 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v3 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 Fri Aug 9 15:00:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11086719 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 D2B4A1398 for ; Fri, 9 Aug 2019 15:01:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF9F11FEBD for ; Fri, 9 Aug 2019 15:01:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B43971FF41; Fri, 9 Aug 2019 15:01:03 +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 601141FF7F for ; Fri, 9 Aug 2019 15:01:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436522AbfHIPA7 (ORCPT ); Fri, 9 Aug 2019 11:00:59 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:33579 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407242AbfHIPA4 (ORCPT ); Fri, 9 Aug 2019 11:00:56 -0400 Received: by mail-wm1-f65.google.com with SMTP id p77so6377332wme.0 for ; Fri, 09 Aug 2019 08:00:55 -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=FQW9fgXTjtmsv01m8EsqhjqMyxwp2hB2gWNkhtjeI3gKvIjXzJxT3AYDBTMkkf0Sbp eaL68Z+EzPhFh4lfYNqCbYHMaO4tn6cnv6IjNJhaAtHJ4NG6Y+ixDbod9U+vzn6zbUmq Wd/t7QGJ1jhic9goY7WebUa8QhFR8eZ4uFUu4XEa76Wgv9EbrJSv8eEH7hLXbalT3TnE 8V8lB4l89OXWUW7/dtfPSBIb456BCiZJ/gEnhZR3zRPWQVD9672aBfI0YmcvU4s3Y1qk nqoFLIaNcVE3dxgN6Q8Op5W4y4nUePUGgmZqZ3NiMQtnZkZPtxeiAWHV5IgrHkTBZDTh r/eQ== 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=D3JvaNHaOW9hr+/zDsoVvKXnXJ9/x7lU2fA9VxEv2NXJeT0VEacVBiaozzKt79r5yA B0oQIu/zBAGP3Cpfp8fKnUoPol03upBWIfpcUjNlkxcF7qkzDZ/wEkxoRBXUu5gfeUqs 2NzxnJPeMG1tZue8vj4KAEjAWUD0ci1y+kDmX7152MzUHZqxu26lmyjZrbix6g5kqMwG G2wqJP3ONNIHmT4og8z8HP2Ef2Npai8wpiYYYXANDHztpZnh541M7kUUKSJVJJmS7dhf fBh0EcN5F7uxv5LhIEAo1WK8zxXe3lSGFC9D24j1XQuy5S02WsUgMeLSOEptll42WDY4 c9RQ== X-Gm-Message-State: APjAAAWjZJCLo2O1cRGGhJOEbq/Riyj5+9qkiF/7Y8Th5jCOiikeHh+/ 9XBbb44ekLeeBHcinPHxc+JzOWHj X-Google-Smtp-Source: APXvYqyPEPLydNofExaqQZyC1HzZv4+QGENlk4ZbMXwZySVHWAG5W4Xs6DaV386a+yT527ygvGQK6g== X-Received: by 2002:a1c:a446:: with SMTP id n67mr5662931wme.56.1565362855012; Fri, 09 Aug 2019 08:00:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 4sm229697970wro.78.2019.08.09.08.00.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 08:00:54 -0700 (PDT) Date: Fri, 09 Aug 2019 08:00:54 -0700 (PDT) X-Google-Original-Date: Fri, 09 Aug 2019 15:00:47 GMT Message-Id: <09dff12a7dfe2219feab85b3fe611aa5c4196375.1565362851.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v3 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 Fri Aug 9 15:00:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11086713 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 B4C9D746 for ; Fri, 9 Aug 2019 15:01:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A47871FE8E for ; Fri, 9 Aug 2019 15:01:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96DDC1FF41; Fri, 9 Aug 2019 15:01:00 +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 3FF881FF7F for ; Fri, 9 Aug 2019 15:01:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407256AbfHIPA6 (ORCPT ); Fri, 9 Aug 2019 11:00:58 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40632 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726140AbfHIPA5 (ORCPT ); Fri, 9 Aug 2019 11:00:57 -0400 Received: by mail-wr1-f68.google.com with SMTP id r1so98496363wrl.7 for ; Fri, 09 Aug 2019 08:00:56 -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=RmPw6VJDHGIlZv1vz0Ypkua2juxfYgzplZqhr1zLxc5NbGjyxFhaVQnavtfuXbDKU+ mxNhATBPP0mI/HKxHcUEXvq1QcmF18UuYeKPaTO/HQPt7u3SLC4zAsS6fnKoWBxcTMif cWg1JlKjr2XEHPD3A8AewyhCEEqlNH+cca4fSjzhwiSe/Gh1A7iGLhVtcuG6xE0m/fYR H/HRBCMFdwjuHCCjkStR/aWNbYmr7iNPFHtydh3bdD0unT6IvD7ZtZ0Vt93IJ/L1VsEp 0WPJYegNrsQUdxmuE/GT83i2/aFseqKBIRFfGamSbGzrDmJWzkfnOPehwOAA05zlICTj KU5Q== 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=ESKjVNDgUOzEjdQ/5B5o8J99BvDx0KvAd02MW9VQ4eUNuQwIdsqGGVHNIqmUDSVqZm 4BhFGt3sVKYcPZ2xg9Rr4HzBz1Li/aTzDI8cnwgALxXEyhcqry5yvqq+ldQLv/LGvMN6 4kMLFZA3/eeQKDvhvTUJiAxf8QtYvDDSisGdA1q1hj88h/srnl6+OkKzRO/O7j+Awx1e aDeliVdWAQPVUXea0fyYQg4JHXSYl2tDHQ+BZ5SpLZ8Gnt/LlY9JpjQL7vIn5deooRuD u9XOP/Bq75W/odmQPm4eJyvhe/GnDUdffh5PewDMXOu5M5UW25VlsD1Dps36fW8LCs7h mP7w== X-Gm-Message-State: APjAAAX7Jw2U+cbtdQllwYxPnz+zUNB7yOhAF9Fwss245rs6XgWB8qne F2W7AyQHWhnMX2ag20n6XVNANDnw X-Google-Smtp-Source: APXvYqxpKkRel9GALB5COGh2ck9N68NRr8BZVfEep6GnbWKS33+08Y/dbE5SURYXtV0Bg63ebuE6mQ== X-Received: by 2002:a5d:4e45:: with SMTP id r5mr25056936wrt.206.1565362855723; Fri, 09 Aug 2019 08:00:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b8sm85475908wrr.43.2019.08.09.08.00.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 08:00:55 -0700 (PDT) Date: Fri, 09 Aug 2019 08:00:55 -0700 (PDT) X-Google-Original-Date: Fri, 09 Aug 2019 15:00:48 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v3 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 Fri Aug 9 15:00:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11086721 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 079AF746 for ; Fri, 9 Aug 2019 15:01:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E95891FE8E for ; Fri, 9 Aug 2019 15:01:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDB2520000; Fri, 9 Aug 2019 15:01:16 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI 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 14BFE1FE8E for ; Fri, 9 Aug 2019 15:01:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436546AbfHIPBE (ORCPT ); Fri, 9 Aug 2019 11:01:04 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41751 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407249AbfHIPA6 (ORCPT ); Fri, 9 Aug 2019 11:00:58 -0400 Received: by mail-wr1-f68.google.com with SMTP id c2so95305786wrm.8 for ; Fri, 09 Aug 2019 08:00:57 -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=qltHrhut4079hJXpE4qG7+O8t9VtgqAQ1eyQeghReLw=; b=VZ2yI9HEwPPURw5z4LcE+CQ1nMiGIF+sjPw2VNKuicVh9i6ZdnH/84uzwUB0aSV2V5 6ipteYLAaNzJBWgfgHFDf+XAxRBGZC9MYeVvff67P2E/WViJQPfXFenDf7UrUQMEgGRR TNRDekHWxTsZAc1BdHh/EeJLE+fwRQYZcRcRCAL6GybF3IYct+cSSRON2UkGmi/c6xQb 0uejPlOQlMrUq64gl/m2avuFcZ1V9/QEBULWTqT6xi0FG08Bpp0dYjwfEMeD9cqqKzKb Fp3fC6uc9DwAJd+xAlu8xYBwYuJbCquRNesQW9BAv6wQGMFpkXz5CTY0FNy3LuG4FsFd xv5A== 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=qltHrhut4079hJXpE4qG7+O8t9VtgqAQ1eyQeghReLw=; b=WF5k268YD1VbUX+bcTYK2Xn3PR0XA5BrGIxBvvhT6kPL1lc9b17sZpMiMIerkYXwbi C+SBwGhTkBvusHmzvNcssY/ymloM/1MUsa/gPcJfJwThejphIAsQvFTAvb6oFCYMaolk 7DtFJ2nVMsF1WF1ZvtrBi9sBBLGhHMDZBAlnwdgocjfGG9rhx2LBpNijrMKv2frI8Snr rj4WUhewds6+mXKZzmQyoP0UP+dKgtbaB73F3KcO/i583hBM2ufiP1FA3JK60qJNIgQ9 uiS9kiVfH6xngoCqngyqCr2jFu9OhK5a5n3JxUB2LaA7diSBZbaMakCWyJIEDNf+TaKP Nk6g== X-Gm-Message-State: APjAAAUYxfRiNs7jH7pM6v2O/czH6H5xTZnQ4ESgvLxCilCvYlWhN9gO IlI0E9C+b9QjzI4HJeG8FxLtUxoN X-Google-Smtp-Source: APXvYqzuxlq3Dg3qtYzo74oOcJm3uEoso2DPOurNmw0Xva5AAbXEkbEUKKYzx7cZ8apK/X9KRk8Gjg== X-Received: by 2002:a5d:4cc5:: with SMTP id c5mr23152391wrt.278.1565362856319; Fri, 09 Aug 2019 08:00:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r15sm103295356wrj.68.2019.08.09.08.00.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 08:00:55 -0700 (PDT) Date: Fri, 09 Aug 2019 08:00:55 -0700 (PDT) X-Google-Original-Date: Fri, 09 Aug 2019 15:00:49 GMT Message-Id: <2002108a30246824f8017da1dea344c1a96f7de2.1565362851.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v3 5/7] quote: add sq_append_quote_argv_pretty() 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 sq_quote_argv_pretty() builds a "pretty" string from the given argv. It inserts whitespace before each value, rather than just between them, so the resulting string always has a leading space. Lets give callers an option to not have the leading space or have to ltrim() it later. Create sq_append_quote_argv_pretty() to convert an argv into a pretty, quoted if necessary, string with space delimiters and without a leading space. Convert the existing sq_quote_argv_pretty() to use this new routine while preserving the leading space behavior. Signed-off-by: Jeff Hostetler --- quote.c | 18 +++++++++++++++++- quote.h | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/quote.c b/quote.c index 7f2aa6faa4..c8ba6b397a 100644 --- a/quote.c +++ b/quote.c @@ -84,12 +84,28 @@ void sq_quote_argv(struct strbuf *dst, const char **argv) } } +/* + * Legacy function to append each argv value, quoted as necessasry, + * with whitespace before each value. This results in a leading + * space in the result. + */ void sq_quote_argv_pretty(struct strbuf *dst, const char **argv) +{ + if (argv[0]) + strbuf_addch(dst, ' '); + sq_append_quote_argv_pretty(dst, argv); +} + +/* + * Append each argv value, quoted as necessary, with whitespace between them. + */ +void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv) { int i; for (i = 0; argv[i]; i++) { - strbuf_addch(dst, ' '); + if (i > 0) + strbuf_addch(dst, ' '); sq_quote_buf_pretty(dst, argv[i]); } } diff --git a/quote.h b/quote.h index fb08dc085c..ca8ee3144a 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_append_quote_argv_pretty(struct strbuf *dst, 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 Fri Aug 9 15:00:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11086715 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 E023E746 for ; Fri, 9 Aug 2019 15:01:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBDC41FE8E for ; Fri, 9 Aug 2019 15:01:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC4AA1FF41; Fri, 9 Aug 2019 15:01:01 +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 60DE01FE8E for ; Fri, 9 Aug 2019 15:01:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407242AbfHIPBA (ORCPT ); Fri, 9 Aug 2019 11:01:00 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38597 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407234AbfHIPA7 (ORCPT ); Fri, 9 Aug 2019 11:00:59 -0400 Received: by mail-wm1-f65.google.com with SMTP id m125so1852041wmm.3 for ; Fri, 09 Aug 2019 08:00:57 -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=chDA17aNMicsr7d9kGny5j2QgX/uBNNYj8M9vxjiQNA=; b=Tr82Td1CKEBWfrMwhTveUtpLqcU2r9JjH9W7mdXvcyO16d5jwk7ACy8NxxnXjvYB/1 7Lm2zHMCTC+5fsL/Zd7fAFcNDl45UeJnhzfTAkCfnDdq0OXGKxeLX/eVki1+uQaI5D48 V1/SSs93PZK+LNcXHovF4KNBPZjnieeh1xiK+BE4HqlB3QFRHutRp4A19n+uLZf0yLiB Fr8wSNiLAg9X1uqtlgj+OF8xnHjXzN/eDGM0F9q1m1FVgZ0B8DJdlrJzdH06p1nVghk7 c2+frDdDXVYG/E47cnTALTYiSc/95UuHhDpjyb5uJaF8bt6AGp4+cmb+mjvmCa7WRWEV huWA== 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=chDA17aNMicsr7d9kGny5j2QgX/uBNNYj8M9vxjiQNA=; b=Ic8twu+sCVVBQT8FQAmQTBoUHxDszhpINKoO8Y1RdOV8dTVHnaRBXrNLWlsWDx47M0 SdmeWkkJ/SNVKqsbTE9EJU5ilXufjrYpVmJYJAyWoOdBtYsR0LWs0QP71FNC+5pIXcjG Pd8Lj8ZoDN9yCRi2uYpHqu6wDMlK8Y0YubYLdFvddnt3Kt9CM40P/NubboZM7o0cmuvy hdz6u99cINscKcMhjIwV/a+lj+it3iSVY8F4B272FA6rpAy3MgYCiYSaddK2Y7eJlPvw nt2ldJrXCNtWnrPLFcSf6S4NSQhhm7JD+sdDq0OtmZlsTiP8JX6SoDE8qxCXzpfFRbs5 UjkQ== X-Gm-Message-State: APjAAAW+1eLFBeSdXwpOERMp9ZCcaOLn1t34ew+OAdRv5Hf3UPSGoEI7 JgS71r3oMVs8cid8sKw7MwjygTGX X-Google-Smtp-Source: APXvYqwLG/XjLyKYelbKWzgZ56kFXQwzhu9ByKJqqleKbimf8GJd5TlkJ/qLdHrStuYoOXHJxhWsEg== X-Received: by 2002:a1c:b68a:: with SMTP id g132mr11855377wmf.66.1565362856983; Fri, 09 Aug 2019 08:00:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 91sm197963446wrp.3.2019.08.09.08.00.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 08:00:56 -0700 (PDT) Date: Fri, 09 Aug 2019 08:00:56 -0700 (PDT) X-Google-Original-Date: Fri, 09 Aug 2019 15:00:50 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v3 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_append_quote_argv_pretty() to normalize how we handle leading whitespace in normal format messages. Signed-off-by: Jeff Hostetler --- trace2/tr2_tgt_normal.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 213724d5cb..438ed05a40 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_append_quote_argv_pretty(&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_append_quote_argv_pretty(&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"); + 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_append_quote_argv_pretty(&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_append_quote_argv_pretty(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } From patchwork Fri Aug 9 15:00:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11086717 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 E825F746 for ; Fri, 9 Aug 2019 15:01:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D55FA1FE8E for ; Fri, 9 Aug 2019 15:01:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9A171FF7F; Fri, 9 Aug 2019 15:01:02 +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 5A83E1FE8E for ; Fri, 9 Aug 2019 15:01:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436534AbfHIPBB (ORCPT ); Fri, 9 Aug 2019 11:01:01 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:39085 "EHLO mail-wm1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407255AbfHIPBA (ORCPT ); Fri, 9 Aug 2019 11:01:00 -0400 Received: by mail-wm1-f51.google.com with SMTP id u25so5888611wmc.4 for ; Fri, 09 Aug 2019 08:00:58 -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=J6NILpO33/UmLgaRCTFlWuCuXaFkp1sEBo7HujJ+nU4=; b=IPjQYrvxO/L1T7qtLebDT9DgSlys2LJHrIaSVgmTrsiJH3AJJYQCPkxRLXjddKRFvB fw50lR7mVJH41lsKnO//fSvnLOdfVng1ASV3aE7vqWbhvh9gU/udwV0Hq99OLaKrhnEG 7wWXR//U7XnSJW31c7nDmsF1NG8ImiOiMEpt2eJ7XQBDBw6cU1sl03yWAkg/cfQ0dgv/ rD+ax6bCrf7Z/f04u4vUp+eIPI7pYQ+U/eo4fLyLq829REDFXqo72An+pcf9fmmdec37 RaCuM6Sl0FAdkxkNBE4qsAArCPN1rpb30uH0KIYuqir1uJ9ZQ1RQC7+ezk+sE1yN4FnG 4j8Q== 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=J6NILpO33/UmLgaRCTFlWuCuXaFkp1sEBo7HujJ+nU4=; b=RGXPZTLFhwpWlftxUMeiNH6uqKJWnVtS48hR3U9yiq0SN7JKFDWgVMWOFb4PeW6wni hVlq6fhL9zWTcoBXw/cPJOhGd4Ku578XMYDEQFC3/ocsA+VcOm7NCci52hu8zdcdtVjv HLs0EqhaTI2tNRq1ya5mGN741YGDzAN5w81moR/qZs18HT46kmD5zBc2Zo6qdBBgbnTh eS0ZRWfbz9zTqgfBJ5iux1HuzGZMXgA+uFasDKutXGwty4akM/pj1tpXnzwTW6aJibRA vy6cr1+Jj1NiBQIKOHrqkb2ScDJEEQ+QiFmL8hVz22RI3h6SCGeA/5AH2xbg100szd/M wVbg== X-Gm-Message-State: APjAAAW5yj/ABsuHRSv2to6Nnqk29FS/jAqmM2UZ5dVqwC7g1OgTongI kJTfUQG69kZJbVPnAm3eKXLwI3wI X-Google-Smtp-Source: APXvYqyv1mDlvsvhPVC7L+EtpYJgnDAOSwcS07IjCoQ46qlz24waIlJqXRA0WSl5/Zfq62blPNfl4w== X-Received: by 2002:a7b:c745:: with SMTP id w5mr11235493wmk.21.1565362857691; Fri, 09 Aug 2019 08:00:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t63sm5645965wmt.6.2019.08.09.08.00.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 08:00:57 -0700 (PDT) Date: Fri, 09 Aug 2019 08:00:57 -0700 (PDT) X-Google-Original-Date: Fri, 09 Aug 2019 15:00:51 GMT Message-Id: <9ab73939855f78563b1554282920aa11ff958f4e.1565362851.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v3 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_append_quote_argv_pretty() 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..fd979db4ad 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_append_quote_argv_pretty(&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_append_quote_argv_pretty(&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_append_quote_argv_pretty(&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_append_quote_argv_pretty(&buf_payload, argv); + strbuf_addch(&buf_payload, ']'); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload);