From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 62FB720248 for ; Fri, 22 Feb 2019 22:25:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726766AbfBVWZG (ORCPT ); Fri, 22 Feb 2019 17:25:06 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42049 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726443AbfBVWZG (ORCPT ); Fri, 22 Feb 2019 17:25:06 -0500 Received: by mail-ed1-f68.google.com with SMTP id j89so3074094edb.9 for ; Fri, 22 Feb 2019 14:25:04 -0800 (PST) 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=gkl/SeuuBvHNvR1dGTKxIOcbnKIgfgd1oncsXBT5oQU=; b=VbY0MnoTq06jIq1OVonAMM/hbeSF2Jxx2NrlgXh30PGNhZGFOPpuwhI7m+3w7cNNvU KHQAQFT2VQUdYoVPlPB6KLy7rlOO7lhOSCb8TPJKthDqe2D71lVEOFL9/rOZKE/6ASDy L70boI6L0Y9jWPlzJ/23QtmsUwhT9nqpOGUgi6W8X1m/H9hcY5a2GG9Vv+9g1iJVPoLn GfFHznmgL7BS7eQmPKlt9JI0mfDZpvpLb155Lo5cNkZfsKmXh0p1U0PoqN9eXaG4WKc0 +pHONNPse4H2gl9dB2cu0jpbRDIandU7KgVzqNSZ+AFYBI0ZfFp6tY/OG05fDndFeunm Wx2Q== 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=gkl/SeuuBvHNvR1dGTKxIOcbnKIgfgd1oncsXBT5oQU=; b=DTJbVUn/27vgNpNfrGX4W1EdUjSw7/9FBuJB0NAbeIQBDWuWJ/k1L3ypE+7GHgB4cj zhb8rxsrCDi+GhkNr0A575zT+dhgSBFl2ARTC5iwa9c0ctIkpk3b+r0WkbTAkEXY7v7z vMdwbIXUEYtdfbV3tW9iV7hJmS0vmp4wulCC3q6bKKGLIhKQVmiQeB34uCt/B+q8JAti iNvgqObHBhHkpf5MDRtKo0i5GdqIQcILtbWxbxH/WX+y6Ibp1yzuyhaUDvS0I6QIs1pp uRlARUchxY06otXbDDZxQpoHnwAqq96AHGvp6IJtWDWDsSGqrlaF8I0gzAz80ezjzeEf Gfvw== X-Gm-Message-State: AHQUAuYR+arrbZY/S15vii4Pd7BD85Oc0KeccyG1wyXbo41AJxvJnKZJ 7O+PG45KgHVsMfNGxWNVs2saztJg X-Google-Smtp-Source: AHgI3IaJ945mGANB6Ll8+1Ruy0/hd1HgG2SwhNmcpLUVjMFPodr826eU2pAVSsYk3R4+lQuSvfMTHQ== X-Received: by 2002:a17:906:d51:: with SMTP id r17mr4465270ejh.101.1550874303835; Fri, 22 Feb 2019 14:25:03 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m32sm728933edc.17.2019.02.22.14.25.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 14:25:03 -0800 (PST) Date: Fri, 22 Feb 2019 14:25:03 -0800 (PST) X-Google-Original-Date: Fri, 22 Feb 2019 22:24:47 GMT Message-Id: <40411100c3dfe142646fe0eac66e138d0ce062d1.1550874298.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v7 04/15] trace2:data: add trace2 regions to wt-status Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: jeffhost@microsoft.com, Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jeff Hostetler Add trace2_region_enter() and trace2_region_leave() calls around the various phases of a status scan. This gives elapsed time for each phase in the GIT_TR2_PERF and GIT_TR2_EVENT trace target. Also, these Trace2 calls now use s->repo rather than the_repository. Signed-off-by: Jeff Hostetler --- wt-status.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/wt-status.c b/wt-status.c index 0fe3bcd4cd..434636850e 100644 --- a/wt-status.c +++ b/wt-status.c @@ -748,12 +748,23 @@ static int has_unmerged(struct wt_status *s) void wt_status_collect(struct wt_status *s) { + trace2_region_enter("status", "worktrees", s->repo); wt_status_collect_changes_worktree(s); - if (s->is_initial) + trace2_region_leave("status", "worktrees", s->repo); + + if (s->is_initial) { + trace2_region_enter("status", "initial", s->repo); wt_status_collect_changes_initial(s); - else + trace2_region_leave("status", "initial", s->repo); + } else { + trace2_region_enter("status", "index", s->repo); wt_status_collect_changes_index(s); + trace2_region_leave("status", "index", s->repo); + } + + trace2_region_enter("status", "untracked", s->repo); wt_status_collect_untracked(s); + trace2_region_leave("status", "untracked", s->repo); wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD")); if (s->state.merge_in_progress && !has_unmerged(s)) @@ -2291,6 +2302,13 @@ static void wt_porcelain_v2_print(struct wt_status *s) void wt_status_print(struct wt_status *s) { + trace2_data_intmax("status", s->repo, "count/changed", s->change.nr); + trace2_data_intmax("status", s->repo, "count/untracked", + s->untracked.nr); + trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr); + + trace2_region_enter("status", "print", s->repo); + switch (s->status_format) { case STATUS_FORMAT_SHORT: wt_shortstatus_print(s); @@ -2309,6 +2327,8 @@ void wt_status_print(struct wt_status *s) wt_longstatus_print(s); break; } + + trace2_region_leave("status", "print", s->repo); } /** -- gitgitgadget