From patchwork Mon Oct 26 19:32:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858529 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A492C2D0A3 for ; Mon, 26 Oct 2020 19:34:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EEE4A21D7B for ; Mon, 26 Oct 2020 19:34:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J3Y7zxDY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793339AbgJZTeB (ORCPT ); Mon, 26 Oct 2020 15:34:01 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37608 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793149AbgJZTc6 (ORCPT ); Mon, 26 Oct 2020 15:32:58 -0400 Received: by mail-wr1-f67.google.com with SMTP id h7so14074714wre.4 for ; Mon, 26 Oct 2020 12:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=baYrUf0z9Aoj8NYpTrRWQMTgfWzZ+3JSg+DTT0+CWsw=; b=J3Y7zxDYPi3ySE9z/y6yIfE4sjeuJZHCNaRVbQRNE2oy9U222q981gg3JjDB7m5c4p 3W+oYqdLVRS9gZjJvz7KDJry2+aSW9qpxWk7LD0/Legh0qY0a+r2EPVKIJdH7c09Ropw 1WCLfmQUzfKA0N2cWyO+qzGQ1I1TFZNqDR3hnXTE/k/pjFdrVyHAuvlwNpwZHMcF+oyn pMvtO0+VocWwoVY+Erx2QKnSzqvNv9MdrkzN7s4xMFo6cx4Qfg5NxSZ3UtdcRYKVH9Ph MPE15c5ngCAKndVFptBUUH0CI39vzRJChkZN/5BvDM8SdbgP7EA3UNAM3hy1/ssrX/sp DFdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=baYrUf0z9Aoj8NYpTrRWQMTgfWzZ+3JSg+DTT0+CWsw=; b=oFU0/Ha5egXGeAIpmciTUnV7HwDMGruTBUS8Ckp/T+RRyv2rDxnmQsDZzWRkDb535Y yF57K0J1yv8MzjGfCXnaxQL3rTfufdUkVAwNC682YzZMgUP4P0FaTbctXE9BS7XxBDDY kcnCdevRS1XoXRn6skTTZZiwfaxyYh35Bm52b1AqBJXA1jlsHOo9ws0QBA72lVzZKVUT q/O+FMlJ70pv3H+mgtTy/gV1jQIuNTTxj7SQJlC656u0Bt6K9CzFTxQslK6eCHnEXDI0 nZfktAQ7N+cG8V5C8vQyHRDSrX5EJD+28eD3cw53pKKeICoW/eqcZzOGKSk2wc55W/Hj xc4Q== X-Gm-Message-State: AOAM533hAeJrnOb7EaYw45d7Er897kD2Z1WrSfDnbhoQy04iMiGaCBK+ OnLcnjbulJ/GEoUiJy7nFULHDAcYxKQ= X-Google-Smtp-Source: ABdhPJymBSHKpfZvA4sRjmsIJnCSeyTyleQ39N6JTG7eKzBNouLP2F/OEgH5tMwX0fTrGCAspbQFdQ== X-Received: by 2002:adf:e8cf:: with SMTP id k15mr19483645wrn.262.1603740775593; Mon, 26 Oct 2020 12:32:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g8sm25718550wma.36.2020.10.26.12.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:32:55 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:44 +0000 Subject: [PATCH 01/10] t/perf/fsmonitor: separate one time repo initialization Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati In preparation for testing multiple fsmonitor hooks Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index fb20fe0937..23755012df 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -68,7 +68,7 @@ then fi fi -test_expect_success "setup for fsmonitor" ' +test_expect_success "one time repo setup" ' # set untrackedCache depending on the environment if test -n "$GIT_PERF_7519_UNTRACKED_CACHE" then @@ -88,6 +88,16 @@ test_expect_success "setup for fsmonitor" ' git config core.splitIndex "$GIT_PERF_7519_SPLIT_INDEX" fi && + mkdir 1_file 10_files 100_files 1000_files 10000_files && + for i in $(test_seq 1 10); do touch 10_files/$i; done && + for i in $(test_seq 1 100); do touch 100_files/$i; done && + for i in $(test_seq 1 1000); do touch 1000_files/$i; done && + for i in $(test_seq 1 10000); do touch 10000_files/$i; done && + git add 1_file 10_files 100_files 1000_files 10000_files && + git commit -m "Add files" +' + +test_expect_success "setup for fsmonitor" ' # set INTEGRATION_SCRIPT depending on the environment if test -n "$GIT_PERF_7519_FSMONITOR" then @@ -115,13 +125,6 @@ test_expect_success "setup for fsmonitor" ' git config core.fsmonitor "$INTEGRATION_SCRIPT" && git update-index --fsmonitor && - mkdir 1_file 10_files 100_files 1000_files 10000_files && - for i in $(test_seq 1 10); do touch 10_files/$i; done && - for i in $(test_seq 1 100); do touch 100_files/$i; done && - for i in $(test_seq 1 1000); do touch 1000_files/$i; done && - for i in $(test_seq 1 10000); do touch 10000_files/$i; done && - git add 1_file 10_files 100_files 1000_files 10000_files && - git commit -m "Add files" && git status # Warm caches ' From patchwork Mon Oct 26 19:32:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17244C5DF9D for ; Mon, 26 Oct 2020 19:33:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B96F320872 for ; Mon, 26 Oct 2020 19:33:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k+aSjZtO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793178AbgJZTc7 (ORCPT ); Mon, 26 Oct 2020 15:32:59 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:52700 "EHLO mail-wm1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793157AbgJZTc6 (ORCPT ); Mon, 26 Oct 2020 15:32:58 -0400 Received: by mail-wm1-f44.google.com with SMTP id c194so12832911wme.2 for ; Mon, 26 Oct 2020 12:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=/aWn/mLews+3vRoUVYodxrwzfdXHwlQxxixYUwKS1M0=; b=k+aSjZtOQEoGSj40YzXoZwNwQH10JLyWCtMXAA6mNKwct8I+N2BeJ493yHEtIdegJ0 mhBgGQLbX+YusGLyBs/rIbht6Udo1ArW/aljEZHyTcn3udnsUZH5KvaKprhl1EDzG4aS CV9petF16ttG23TGpIiJG0slHE6ORMmmqmcpDXrnHeEkt9VudKtpEbu1l+XanLWTkVqZ TmzebIlxBW3fUFsXZATus0wBtDPCcig3DUOzY5uWWMYRSICVuCbE9hIllhXmjTY43a82 EuSvAPcpCBXkStTvf6CG7RxMn73qsiLondZMWP2T3v8hL78fLlf5M6FSoCfgkdGENYIA e8mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=/aWn/mLews+3vRoUVYodxrwzfdXHwlQxxixYUwKS1M0=; b=AAXqXwgbTu79Z0PbsoDlvU4icrWMJkAMxkN47vJKjtkJRAUrjx88FJqEWrl3aXZh+B 2E9BIdWAk7i6YX25dh3RgqJZJskA6sxYQQU1lTXStvmur3wf8KtYaet48YWqgSVFpbaI lku2Q5YE4D3KjDJWeaRzF9neeICO4hMdOK3CejC29DoCMUYnZFXZfkqGmZGgQuadOjWM har4qDWgJrSHfjIiMlXGXNilL6i65aVrfCtoJUA8FoEEs2bXcDmShJ69KYv/0CfnqK8B 0D/FqxXPVwolPsZJGjAV+HDCdlMdFQa9gvAJ4wvLNg7h5DCwz/F47uF0iUnzL0F+JtI1 37zg== X-Gm-Message-State: AOAM5317ZDVRXyXC6P2nruwDyqFl2qdE1jXeTSrQQGpB6x2eIBDqehlC DxeUAtZJI923plMn9z6a0o9MYMTTR74= X-Google-Smtp-Source: ABdhPJx37IXVHEZK/x5FVY/uIGloPQYV0/eZAHJUBi39Vmee1KtYD+lp+iIc+hegxwjiGDPgQ/WNeA== X-Received: by 2002:a1c:5f42:: with SMTP id t63mr17274262wmb.19.1603740776356; Mon, 26 Oct 2020 12:32:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c10sm8794225wmb.20.2020.10.26.12.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:32:55 -0700 (PDT) Message-Id: <34d11447b46b06ae5f4fa8700885bcc8b70a3a43.1603740773.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:45 +0000 Subject: [PATCH 02/10] t/perf/fsmonitor: move watchman setup to one-time-repo-setup Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati It is only required to be set up once. This prepares for testing multiple hooks in one invocation. Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 23755012df..4030f569cf 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -94,7 +94,13 @@ test_expect_success "one time repo setup" ' for i in $(test_seq 1 1000); do touch 1000_files/$i; done && for i in $(test_seq 1 10000); do touch 10000_files/$i; done && git add 1_file 10_files 100_files 1000_files 10000_files && - git commit -m "Add files" + git commit -m "Add files" && + + # If Watchman exists, watch the work tree and attempt a query. + if test_have_prereq WATCHMAN; then + watchman watch "$GIT_WORK_TREE" && + watchman watch-list | grep -q -F "$GIT_WORK_TREE" + fi ' test_expect_success "setup for fsmonitor" ' @@ -105,17 +111,13 @@ test_expect_success "setup for fsmonitor" ' else # # Choose integration script based on existence of Watchman. - # If Watchman exists, watch the work tree and attempt a query. - # If everything succeeds, use Watchman integration script, - # else fall back to an empty integration script. + # Fall back to an empty integration script. # mkdir .git/hooks && if test_have_prereq WATCHMAN then INTEGRATION_SCRIPT=".git/hooks/fsmonitor-watchman" && - cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT" && - watchman watch "$GIT_WORK_TREE" && - watchman watch-list | grep -q -F "$GIT_WORK_TREE" + cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT" else INTEGRATION_SCRIPT=".git/hooks/fsmonitor-empty" && write_script "$INTEGRATION_SCRIPT"<<-\EOF From patchwork Mon Oct 26 19:32:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C798C5517A for ; Mon, 26 Oct 2020 19:33:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F16872085B for ; Mon, 26 Oct 2020 19:33:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hkD+COFr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793194AbgJZTdC (ORCPT ); Mon, 26 Oct 2020 15:33:02 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:35800 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793159AbgJZTc7 (ORCPT ); Mon, 26 Oct 2020 15:32:59 -0400 Received: by mail-wm1-f66.google.com with SMTP id h22so2589731wmb.0 for ; Mon, 26 Oct 2020 12:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=3INWQREZtlbKjwYLMGN8xIHxujHJnSCBHYw5p83SoJ4=; b=hkD+COFrs1nUl5nNcXrDeqywBPlfPXFoJh7+EpP4WvHGtDW60DMa8+PdNFdQD1iiX9 KCl11pvRigReFISIwkz+uL3w+8umC7mTz0JOLT4bCT727TBdGKpeJ1M4QPbv+FdLQmz+ 7Wez6mk9eUx2GoEtPm6KkbOOkVMQq/VqAx63INpSNF/Xt22rdr0JBVhexux52WdFS/aX vtoIkJsgpJgnshnyqGUPcrm8drk5qDxseKqXl34Mvw/2zX0C5+4+UuId/7fhNzC9dMId wYvH8j512KMsNDX9jDcgMl0hOCSJVETz4b2YVQTg6vuOifWknOoNoZjSNQgdBzC/6tm0 BYfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=3INWQREZtlbKjwYLMGN8xIHxujHJnSCBHYw5p83SoJ4=; b=INKLHIJ3aI9fIQqD98Ede+KyVAdeFDUbSzr9pgDOVrua0SoTGRoU7Pys/Gz+XhpVEU njah4U4yuKHfOeom8G5dyJf+PYESio/zjsGBjV/v/tW8v3Z4aMJC0mGGOjRzZaK93uQb zBb4eP659Wx9btxXPw0kx5eW96ooP4Vdae9KSK9jhiTjAeCPFWZxJdTC1fpkJMXB646j BEqPB5Veli5Di2WoPK9EwUfn9/QYhixblTwc5CHZNgsIONijPZ4uE88okjS8wQtRJzDd RAENvwrVk+1KFoXnMISJLuW2pMXfjNtGxCF4TQRaIK4s6LE6NUkn2sWLS8OWN1RmgiOL nSqg== X-Gm-Message-State: AOAM531xpLjSf5es6W3KCbhdfosf2zj9J/9nEg7ODLBSUvpc++vJ/Pmk QR2s5IqblRNNxqdjrQvfAX4nPipT5Q0= X-Google-Smtp-Source: ABdhPJwNS1aZ4i/aX7QsczptZozUJYXOugt9ZPi63Zfc+YtP/EcC1A5WI/xuf+amPlpW8DAxmvzBIw== X-Received: by 2002:a1c:3503:: with SMTP id c3mr17392506wma.43.1603740777127; Mon, 26 Oct 2020 12:32:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d30sm25033304wrc.19.2020.10.26.12.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:32:56 -0700 (PDT) Message-Id: <79cc61f56adf7769521d2e2ba4c27c1a3bbc1d76.1603740773.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:46 +0000 Subject: [PATCH 03/10] t/perf/fsmonitor: improve error message if typoing hook name Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati Previously - it would silently run the perf suite w/o using fsmonitor - fsmonitor errors are not hard failures. Now it errors loudly. GIT_PERF_7519_FSMONITOR="$HOME/rs-git-fsmonitorr" ./p7519-fsmonitor.sh -i -v fatal: cannot run /home/nipunn/rs-git-fsmonitorr: No such file or directory not ok 2 - setup for fsmonitor Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 4030f569cf..88b3717e2a 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -126,7 +126,9 @@ test_expect_success "setup for fsmonitor" ' fi && git config core.fsmonitor "$INTEGRATION_SCRIPT" && - git update-index --fsmonitor && + git update-index --fsmonitor 2>error && + cat error && + [ ! -s error ] && # ensure no silent error git status # Warm caches ' From patchwork Mon Oct 26 19:32:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22339C4363A for ; Mon, 26 Oct 2020 19:33:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C6C4F20872 for ; Mon, 26 Oct 2020 19:33:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XljQkb72" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793307AbgJZTdk (ORCPT ); Mon, 26 Oct 2020 15:33:40 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:38678 "EHLO mail-wr1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793172AbgJZTc7 (ORCPT ); Mon, 26 Oct 2020 15:32:59 -0400 Received: by mail-wr1-f43.google.com with SMTP id n18so14047498wrs.5 for ; Mon, 26 Oct 2020 12:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=8UBShdbdG3tTDDgUqILjKjphuN567JPoBWZWePiOMQ4=; b=XljQkb72bfUt71mGLPaRbZ6eKs7NhUBTICVizr/WxzOBslX+wNSm5oSBQ3nkT0tYdw LPnnU8Vgt4soU7UefuQEZsR0l0qDtdQvMyhK44IzhVBhcR3l8J2mkVMhgtK0NKohRtkZ eTKOEBdqgioe10XBlsMorIH1vvrkRuaHo4J9RYNNh9MFDkLTVWEW97hXOkpv9Tsls3IT 7NrVNVPt13H+0OqNzr5dOB5to/ZvlNz3cGd6ne2T8w10wwltxpQh/uLDB0+ozrztHw8x MSQD1yfCsy8FCHc+LK2DSmpKrAONGrjr2jZ6BBWdmkOuTD9p42Uy3GSDJ8jIOi1YzQzk KqWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=8UBShdbdG3tTDDgUqILjKjphuN567JPoBWZWePiOMQ4=; b=QjoV2C8UFilEjfy/CtwVuzygizkqNridn57gKgk74cyLK07DG0HYxiYlCyGwFMuWGs NaOGO50LQGEyMxsmIxiWY96h7i14sZxirNf1gLygphqD9uYCiq5GUZ11w7JtTAMqys/H X6LYZb9jRc71VBEnniZjdXNCHcFIwfnnlGTxfH9NTaZB1OcmCgSQ5of98DzWwA9LHjs5 m6c+CGy+wp46JFFR8mT0e6jQ04dZBNPAThDCyw4udduGF1iQ+FYPJj9XEhj6evB1tlBk jxTKAn3c1pqDgvdXGpbrgpZXSxMjN0WygwkFFRoP1i3Nvx4QGKYswXv9lG6iN0N1hWf8 jquQ== X-Gm-Message-State: AOAM531QCj4p35wRmkXHNV/cgroS+y2ojgWzHfk6B0Q9sL3MSaiYNULW whl887wtkPVGK6hS4mIBaYhDwZAUrd8= X-Google-Smtp-Source: ABdhPJxMK8d+5NdFjuMo/+Jb54d/XXGGqGYu0MKc83rrf/KvTVyTDLtpZwgIkM55dnH9xGf6qlUtbQ== X-Received: by 2002:a5d:4d0d:: with SMTP id z13mr18875986wrt.23.1603740777950; Mon, 26 Oct 2020 12:32:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c10sm8794308wmb.20.2020.10.26.12.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:32:57 -0700 (PDT) Message-Id: <60b5354a35faeb98d11f7f742c708ccc7cb38536.1603740773.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:47 +0000 Subject: [PATCH 04/10] t/perf/fsmonitor: factor description out for readability Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati There was much duplication here. Prepares for making changes to the description. Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 88b3717e2a..aa6b82d756 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -141,43 +141,45 @@ test_perf_w_drop_caches () { } test_fsmonitor_suite() { - test_perf_w_drop_caches "status (fsmonitor=$INTEGRATION_SCRIPT)" ' + DESC="fsmonitor=$INTEGRATION_SCRIPT" + + test_perf_w_drop_caches "status ($DESC)" ' git status ' - test_perf_w_drop_caches "status -uno (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "status -uno ($DESC)" ' git status -uno ' - test_perf_w_drop_caches "status -uall (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "status -uall ($DESC)" ' git status -uall ' - test_perf_w_drop_caches "diff (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "diff ($DESC)" ' git diff ' - test_perf_w_drop_caches "diff -- 0_files (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "diff -- 0_files ($DESC)" ' git diff -- 1_file ' - test_perf_w_drop_caches "diff -- 10_files (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "diff -- 10_files ($DESC)" ' git diff -- 10_files ' - test_perf_w_drop_caches "diff -- 100_files (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "diff -- 100_files ($DESC)" ' git diff -- 100_files ' - test_perf_w_drop_caches "diff -- 1000_files (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "diff -- 1000_files ($DESC)" ' git diff -- 1000_files ' - test_perf_w_drop_caches "diff -- 10000_files (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "diff -- 10000_files ($DESC)" ' git diff -- 10000_files ' - test_perf_w_drop_caches "add (fsmonitor=$INTEGRATION_SCRIPT)" ' + test_perf_w_drop_caches "add ($DESC)" ' git add --all ' } From patchwork Mon Oct 26 19:32:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D683FC5DF9E for ; Mon, 26 Oct 2020 19:33:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 876FA2085B for ; Mon, 26 Oct 2020 19:33:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f9Hi+RYR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793302AbgJZTdj (ORCPT ); Mon, 26 Oct 2020 15:33:39 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33226 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793180AbgJZTdB (ORCPT ); Mon, 26 Oct 2020 15:33:01 -0400 Received: by mail-wr1-f65.google.com with SMTP id b8so14089611wrn.0 for ; Mon, 26 Oct 2020 12:32:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=gCEsUnsq35tyokpp1i/5kDvTkvMw9U8I88ua8VJ0XHc=; b=f9Hi+RYRouM3LRBTEbtqWQxUIm7I4tzQ5Vq9KU49loJ2XVFCARXz54ZQfdlOv7NaUx oWsCfB7krdk1MWaBdBAkp7BsQD+TRLnAi95JebeREmaQbpNcLZtE/AWgtMu1cJScBOOS K1Varufa5ydm2SaazHfcT4rwQrNSg1SJWaA1dUrlJZ278tgglgkODN5V7oYw9J9N9RzD nHCYVb8bLjVXF4D7msYzr3d1NFUqMlxgp6pe8I9/Lpktf8nWqYGzJNyp3S/VJ4ma5os2 gBxzbqlOdnzVcdHepLJ1gVYdBXVjf6Xs/KWjtj9y2AGzwbAFZEG5+Qb7kHxXBvA/4c7F NYgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=gCEsUnsq35tyokpp1i/5kDvTkvMw9U8I88ua8VJ0XHc=; b=IBAx0ph/1HYsanbsrCGYSLitXo0B9IBBklTJYOl6uQJRCbtODZYTnCJWM0RfjgbMav XLF/XDCj4j61JZiyCg/NCrBSb5XV/y9xZDtYIbJ0rvSK7zgUZ9OnUrCZAShs+pl8zvWY YmDkXnheNQqJSGF8xx+UPIjV7ti+at7U8bcGnLliJHXXvkwfpY7JO6XoL4cQvTcAHc+T 1byNsRiaMVxRj6ba5F7MUBWfIQu7czL9rPqrYhUJEo5iK+DbYm2eTDwHV9I5JdElI+ES PxDL77qn/isTN5fF/r+XQrSHRIurxNLZlEgKyXSNJEnd3erONqNrg2ngRsCV3Y0wu980 KhOw== X-Gm-Message-State: AOAM531AzO3u9LkGbOgAsy4sApzS52rsnj2boiuCJLOqGuxv95guYhFg y6V5ql+39St7ar8t9N+kLFf8UVDKg3k= X-Google-Smtp-Source: ABdhPJxKL/+JOsp0JilelLUWvCLupVioH0OEXCGDaP/LvGMy9Kda6bkXwHpeN631+H2IjE5B51d19Q== X-Received: by 2002:adf:94c6:: with SMTP id 64mr19190557wrr.8.1603740778700; Mon, 26 Oct 2020 12:32:58 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 205sm23458481wme.38.2020.10.26.12.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:32:58 -0700 (PDT) Message-Id: <02c2afcb96b7eded3a48cdffb60c5c17f3a7d61a.1603740773.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:48 +0000 Subject: [PATCH 05/10] t/perf/fsmonitor: shorten DESC to basename Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati The full name is lengthy and makes it hard to read Before: 7519.3: status (fsmonitor=/home/nipunn/src/server/.git/hooks/rs-git-fsmonitor) 0.02(0.01+0.00) After 7519.3: status (fsmonitor=rs-git-fsmonitor) 0.03(0.02+0.00) Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index aa6b82d756..2c817db1ae 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -141,7 +141,11 @@ test_perf_w_drop_caches () { } test_fsmonitor_suite() { - DESC="fsmonitor=$INTEGRATION_SCRIPT" + if test -n "$INTEGRATION_SCRIPT"; then + DESC="fsmonitor=$(basename $INTEGRATION_SCRIPT)" + else + DESC="fsmonitor=disabled" + fi test_perf_w_drop_caches "status ($DESC)" ' git status From patchwork Mon Oct 26 19:32:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858511 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16B48C56202 for ; Mon, 26 Oct 2020 19:33:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BAA582085B for ; Mon, 26 Oct 2020 19:33:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pgcw/WDV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793232AbgJZTdH (ORCPT ); Mon, 26 Oct 2020 15:33:07 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:52436 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793182AbgJZTdC (ORCPT ); Mon, 26 Oct 2020 15:33:02 -0400 Received: by mail-wm1-f65.google.com with SMTP id c194so12833022wme.2 for ; Mon, 26 Oct 2020 12:33:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=wJz0vtwqUUjo37ezSXWvV4obEraNnTX8m6e065xvb5E=; b=pgcw/WDV/B9zJUpSJidJ10RcL8+8++P++PZ5D1SVby1dZZCUa41ghN609xzVxfyg+T DQwSvq2fn6qi36XFpLNBnBVTkVG8siLznfFSwl1N4+2PoyYEfrBpdTXRDe2hwk9s4XZn 36bz19Cy1dBUD9cn7SwlOEfWDp3exhmhGHGNlwSWEV5di4uW1U1zJqIBHVy2zYGLXjOg 66M4L679Se/f94rOi96Wte1HNqIgdzghRhNXlObtGFx1ODTHSebJ6DzCfnsYQql6gjrJ yqu9z7JGqtcP+hvc8n5ULKrRjEbn8Nr/u/zFt5TssWmSCUlCzL7rZhaKd4fyIBzq5oCo BQDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=wJz0vtwqUUjo37ezSXWvV4obEraNnTX8m6e065xvb5E=; b=RFc13FY8gwyRPowPRrfB00qEZYK2Hk4GsNK6K5DR95/fXAjpmu0K3HJIryIkfPiFQj /TBLMRoqCLyPttCAeW1QHcoiNT1pg1OVhqbMv2pREbEq148w/i4HEB3CDd7c+UvS5mGA WZQHrgP+oytGzL905b3p2tjh3DO7iqb92B6MSMIxvQgieJJ050uoSJcy53tNtBvuswgV /yLliYgF8KHgsGJnowK4x57xgCoMVJELsX3lGt/DlUUSPhcLEBp9cCuL3QpX/bhWDGoL d+WeO1FptI3cv3hBFAmMOnt5ZRJv3C6/FMxsLfmQ/UFkgTR/CA0qeNF8TR/YtnId+y2D ++cA== X-Gm-Message-State: AOAM530PnSHi6JfC/v4FWo5QxboW71csVka6SjWSwcteSGTjBppOVTrH XjuNhRq1IFCtkVLQXhv39lsVsz/FI+4= X-Google-Smtp-Source: ABdhPJy/sbEpTff5wZbU/MqMEibe5B4+pEX4zlUmcddOc1hxT/qACKKczUB6iz/yjZzG6Vh1K/hr7g== X-Received: by 2002:a1c:20ce:: with SMTP id g197mr17740690wmg.18.1603740779531; Mon, 26 Oct 2020 12:32:59 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z191sm23172782wme.30.2020.10.26.12.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:32:59 -0700 (PDT) Message-Id: <6543e90c00843214676b658a033656e040f1c6a1.1603740773.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:49 +0000 Subject: [PATCH 06/10] t/perf/fsmonitor: silence initial git commit Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati It is extremely verbose, printing >10K non-useful lines Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 2c817db1ae..970caff3d2 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -94,7 +94,7 @@ test_expect_success "one time repo setup" ' for i in $(test_seq 1 1000); do touch 1000_files/$i; done && for i in $(test_seq 1 10000); do touch 10000_files/$i; done && git add 1_file 10_files 100_files 1000_files 10000_files && - git commit -m "Add files" && + git commit -qm "Add files" && # If Watchman exists, watch the work tree and attempt a query. if test_have_prereq WATCHMAN; then From patchwork Mon Oct 26 19:32:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858515 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D22DC4363A for ; Mon, 26 Oct 2020 19:33:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0354021D41 for ; Mon, 26 Oct 2020 19:33:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NCo5CEvD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793226AbgJZTdH (ORCPT ); Mon, 26 Oct 2020 15:33:07 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:42842 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793184AbgJZTdC (ORCPT ); Mon, 26 Oct 2020 15:33:02 -0400 Received: by mail-wr1-f65.google.com with SMTP id j7so14014506wrt.9 for ; Mon, 26 Oct 2020 12:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=zVIK+epOFJwa8gAuRtkhk+wC/W8LUB+JZP9Y34/sbNs=; b=NCo5CEvDCLK7crX1a3oebshDQDCJXBMkbFTsPoldOX0gMWcGTp+/GfGLZ8pnrmpy9F 6jrPuZiJxXmAdeOzQveRgrBIx0XvkncIiJ21Jc/7sI7+JtB2JjjX9LHVFk3rPTB5jjhB /UehLbeEMHsHGgjvZ7cRvTT9+MAQfvhyBWTWx9yjZhSPXcb9mU1wLLj8otKzUC6cwINs 83wxouNdy1SIO9ugHvG/XUMezDa/0WfKERaL9yqn/isYGJhBhehO8gRsKSDR3ml3GtW3 Ek2L1UC7jEvmCf6HQm4MLI12gzjNYqM+bl2i8NYGyIFbE98JZ40Epv8UJnyEu2PbjYu+ y5ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=zVIK+epOFJwa8gAuRtkhk+wC/W8LUB+JZP9Y34/sbNs=; b=R8amnsDw4FFf0yRK3Tls7noMbvuFUweK3HDRJza0Sgj0JK8LHpRWcrCOQI/5pI0hhf iPiiJ45KfADkYFGWSfUIVYvp0sr+E+uHwI2CD5pTTDiUxoYNTRZCw0y1LlQMYMwcpJoa M8Lkn5KFAsMsWzp2nMHmikmjDpGGgACqcoF6eNHRV+0a584XyLkOMzyfw5UbXonXrGZ8 Dye+zI9Zt9+45Zb4OoZdUmgF1aq4u0uL9ApRvBqSe1ahVwdI8WTrVm4GZU5wId96rzs9 V736oVyGJfXdtLWruNpJmb1AeE8uPsSnsNrBg3JGm4ZMV9S0Hu3ZMRksJleUQN6qMUfD y/RQ== X-Gm-Message-State: AOAM533LdfgRgOb44OhDHHvUAr5m29fA+hAd8V2gWq6XYzgkfhcFppB8 vCUYq/9i6n/lr91MdUGUpA2a1jTOzhU= X-Google-Smtp-Source: ABdhPJxLZfPmI+rD1esV/x72X/i+WG2E9mZAFcEEqhWCPE4BvHH5vikjXRRsosjdK4UFxQmMS+RIZg== X-Received: by 2002:adf:f182:: with SMTP id h2mr19494087wro.199.1603740780233; Mon, 26 Oct 2020 12:33:00 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t23sm14112213wmn.13.2020.10.26.12.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:32:59 -0700 (PDT) Message-Id: <409f400376dadd81335cb32e026bec1b4f0f5a26.1603740773.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:50 +0000 Subject: [PATCH 07/10] t/perf/fsmonitor: factor setup for fsmonitor into function Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati This prepares for it being called multiple times when testing different hooks Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 970caff3d2..087f66ecc2 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -103,7 +103,7 @@ test_expect_success "one time repo setup" ' fi ' -test_expect_success "setup for fsmonitor" ' +setup_for_fsmonitor() { # set INTEGRATION_SCRIPT depending on the environment if test -n "$GIT_PERF_7519_FSMONITOR" then @@ -130,7 +130,7 @@ test_expect_success "setup for fsmonitor" ' cat error && [ ! -s error ] && # ensure no silent error git status # Warm caches -' +} test_perf_w_drop_caches () { if test -n "$GIT_PERF_7519_DROP_CACHE"; then @@ -188,6 +188,10 @@ test_fsmonitor_suite() { ' } +test_expect_success "setup for fsmonitor" ' + setup_for_fsmonitor +' + test_fsmonitor_suite test_expect_success "setup without fsmonitor" ' From patchwork Mon Oct 26 19:32:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7991EC4363A for ; Mon, 26 Oct 2020 19:33:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3046B2085B for ; Mon, 26 Oct 2020 19:33:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HG20Fxi0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793222AbgJZTdG (ORCPT ); Mon, 26 Oct 2020 15:33:06 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39059 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793196AbgJZTdE (ORCPT ); Mon, 26 Oct 2020 15:33:04 -0400 Received: by mail-wr1-f65.google.com with SMTP id y12so14027600wrp.6 for ; Mon, 26 Oct 2020 12:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=7FAHzSHfC89YxDPrGqQj5H6PV+sO03eCWpJprbtTXaI=; b=HG20Fxi0xv/b1/U0T8ipPuckWUL53VM2PNExTsb8bYgAnAd2KrSvE6c5QbMpfY06c8 0zRF3VQexy3n/ynNdbtP4sqlli9Shqr2SjPZ3yXLjWjA9Oba3gQfuAAsk3f0KQ3g8IAJ iNSaqmXgwyTsRuTSug1aRemNrVBEE7RxOKvSJUIOQrTq/6Ab2Gn+YroWz7VCTpYg9yZ1 nBWoLZoSODltAYQqpKtiz5S7oTEM00k9D2k6oaS1hmtTcg24zrcW5SvfFwXFjAYLUK+s a6ocfATGr/mVCOg/cvYwbT/1XoPle1rZdyufuHmARcelufKCCylibrMbumETrhQbTDPw Lu3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=7FAHzSHfC89YxDPrGqQj5H6PV+sO03eCWpJprbtTXaI=; b=hVI5Rqx+cTmDzl0QKrZS5AFLQeQLwowasvffNicpbr2kZNXuOsCjHkBqZ5kYdRFEX1 ppzBXeBVld9f45mqdlQBxcRcPbDpH5KHGo3aoLLcAQMF5wIR7RwxUzyr6x7H/epeFVSd 7o/N7TjBqQ2dmR4k0UYbbrxgW2/Tw84UlK1FqcTIyKp/a7Jz5GiZpw1ZKK+QTueoZw5K 3v/ugi9X4/EbiE+xzSouB2G7nGg2UUjsWX4AWA1AfQwCfHvSgHvLCeQByCCRAHmNd5/z PrLd0OFQgAio9V03PmELMnPcl0XXMjagIlKn6Ll2hdsJfDx2/OUVfgHnrziRBYGTKs4v jW5Q== X-Gm-Message-State: AOAM533E2+vAoS0KgdR6vJTMXLz8SG88zpZBL3rHcUiksyPAf7wBY4aH eHK+AUNBd2XfhxQqoYekP2kUIEqa6PY= X-Google-Smtp-Source: ABdhPJyFe/U+mjdepfvtswzds0c0wE6EdZYr/xfnE5DC5TjIjpXjyxOHYX/+r+K461IC8nWIHnFLlA== X-Received: by 2002:a5d:6143:: with SMTP id y3mr20640192wrt.277.1603740780951; Mon, 26 Oct 2020 12:33:00 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a15sm26282528wrp.90.2020.10.26.12.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:33:00 -0700 (PDT) Message-Id: <055896284083aa0607404ffe82f6d44df61fcf59.1603740773.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:51 +0000 Subject: [PATCH 08/10] t/perf/fsmonitor: initialize test with git reset Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati Previously, the git add of the previous suiterun would pollute the numbers in the second run Before: Test this tree ----------------------------------------------------------------------------- 7519.4: status (fsmonitor=fsmonitor-watchman) 0.40(0.36+0.04) 7519.5: status -uno (fsmonitor=fsmonitor-watchman) 0.19(0.12+0.07) 7519.6: status -uall (fsmonitor=fsmonitor-watchman) 1.36(0.74+0.61) 7519.7: diff (fsmonitor=fsmonitor-watchman) 0.14(0.10+0.04) 7519.8: diff -- 0_files (fsmonitor=fsmonitor-watchman) 0.14(0.10+0.04) 7519.9: diff -- 10_files (fsmonitor=fsmonitor-watchman) 0.14(0.09+0.05) 7519.10: diff -- 100_files (fsmonitor=fsmonitor-watchman) 0.14(0.10+0.04) 7519.11: diff -- 1000_files (fsmonitor=fsmonitor-watchman) 0.14(0.08+0.06) 7519.12: diff -- 10000_files (fsmonitor=fsmonitor-watchman) 0.14(0.10+0.04) 7519.13: add (fsmonitor=fsmonitor-watchman) 2.03(1.28+0.69) 7519.16: status (fsmonitor=disabled) 0.64(0.49+0.90) 7519.17: status -uno (fsmonitor=disabled) 1.15(0.92+1.00) 7519.18: status -uall (fsmonitor=disabled) 2.32(1.46+1.55) 7519.19: diff (fsmonitor=disabled) 1.44(1.12+1.76) 7519.20: diff -- 0_files (fsmonitor=disabled) 0.11(0.07+0.05) 7519.21: diff -- 10_files (fsmonitor=disabled) 0.11(0.06+0.05) 7519.22: diff -- 100_files (fsmonitor=disabled) 0.11(0.08+0.03) 7519.23: diff -- 1000_files (fsmonitor=disabled) 0.11(0.08+0.04) 7519.24: diff -- 10000_files (fsmonitor=disabled) 0.12(0.06+0.07) 7519.25: add (fsmonitor=disabled) 2.25(1.47+1.47) After: Test this tree ----------------------------------------------------------------------------- 7519.4: status (fsmonitor=fsmonitor-watchman) 0.41(0.33+0.09) 7519.5: status -uno (fsmonitor=fsmonitor-watchman) 0.20(0.14+0.07) 7519.6: status -uall (fsmonitor=fsmonitor-watchman) 1.37(0.78+0.58) 7519.7: diff (fsmonitor=fsmonitor-watchman) 0.14(0.10+0.04) 7519.8: diff -- 0_files (fsmonitor=fsmonitor-watchman) 0.14(0.08+0.06) 7519.9: diff -- 10_files (fsmonitor=fsmonitor-watchman) 0.14(0.09+0.05) 7519.10: diff -- 100_files (fsmonitor=fsmonitor-watchman) 0.14(0.10+0.05) 7519.11: diff -- 1000_files (fsmonitor=fsmonitor-watchman) 0.14(0.11+0.04) 7519.12: diff -- 10000_files (fsmonitor=fsmonitor-watchman) 0.14(0.09+0.05) 7519.13: add (fsmonitor=fsmonitor-watchman) 2.04(1.27+0.71) 7519.16: status (fsmonitor=disabled) 0.78(0.59+0.99) 7519.17: status -uno (fsmonitor=disabled) 0.43(0.32+0.88) 7519.18: status -uall (fsmonitor=disabled) 1.58(0.96+1.38) 7519.19: diff (fsmonitor=disabled) 0.36(0.31+0.79) 7519.20: diff -- 0_files (fsmonitor=disabled) 0.11(0.08+0.03) 7519.21: diff -- 10_files (fsmonitor=disabled) 0.11(0.07+0.04) 7519.22: diff -- 100_files (fsmonitor=disabled) 0.11(0.08+0.04) 7519.23: diff -- 1000_files (fsmonitor=disabled) 0.11(0.07+0.05) 7519.24: diff -- 10000_files (fsmonitor=disabled) 0.12(0.08+0.05) 7519.25: add (fsmonitor=disabled) 2.25(1.48+1.47) Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 087f66ecc2..51c03a2596 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -128,8 +128,7 @@ setup_for_fsmonitor() { git config core.fsmonitor "$INTEGRATION_SCRIPT" && git update-index --fsmonitor 2>error && cat error && - [ ! -s error ] && # ensure no silent error - git status # Warm caches + [ ! -s error ] # ensure no silent error } test_perf_w_drop_caches () { @@ -147,6 +146,11 @@ test_fsmonitor_suite() { DESC="fsmonitor=disabled" fi + test_expect_success "test_initialization" ' + git reset --hard && + git status # Warm caches + ' + test_perf_w_drop_caches "status ($DESC)" ' git status ' From patchwork Mon Oct 26 19:32:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5508C4363A for ; Mon, 26 Oct 2020 19:33:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E9AA20872 for ; Mon, 26 Oct 2020 19:33:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FjTacgKA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793288AbgJZTde (ORCPT ); Mon, 26 Oct 2020 15:33:34 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43330 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793159AbgJZTdF (ORCPT ); Mon, 26 Oct 2020 15:33:05 -0400 Received: by mail-wr1-f68.google.com with SMTP id g12so14045749wrp.10 for ; Mon, 26 Oct 2020 12:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=EFatkJB9QgTUgoiX+nNGHEz4hKRjwImsfA2Cgf/edVw=; b=FjTacgKAHitaAMwts1JLNSMIOdly6jZlCNK77Rld5xHbsn9anZ3S3Fpxo5ODjZWjdr cRxUa/G5uMK3IGT/sw8L5XwO533S05n4HtTsm39iGp5sK7f6FeNX2AVjp/6+/8Tw6oCr uPrW4268TkEF+OjAf5/wyI09hoC0vgxaR4v5lcPDSjH5w7jE5KaIXNTT/enVfpDHo6n3 Q+Rfs3/R21JjbzNSRSGpFEYskg8Xt3Tgb2X+lQ8+dyThugt3q+TImUf7JxIjP53rbkfD uKHFcwa99rbLL0F40GhDHYHmlAEwj4Hl4LZOWygkxb3iiAIv95/NZGpqVoktxIN5hvGI ge4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=EFatkJB9QgTUgoiX+nNGHEz4hKRjwImsfA2Cgf/edVw=; b=Z+MaBl1kjVBwB2bbXCbLj9aBboWOV6FmN7mC38ft7BwYMua/LDJro6jLT6upFHTuXA 5gq/FEJ8PrKYMxuprKCtzE+vWrwP+4Kzneiq20qq3ruCqmYIzs2rEuc7lxPLEzCyb90l Azkp4O60+MTa0cP5gIQ8csF/eU5s8dGph2xOBQKCdcbRT7NKvybQK+UdpRP7p48/uuZ+ T1EaEYfNW2lHn+Td1xIU1mFWjscUmRUuadK4MJ3GfOv4fH31vAw9NWavsN3G8Jed1QCO Tr5xE/GllJYumzYDHFNjFkZrAAeA4v3nvYrtlCkXiFuhxZCmlnE/AhwmLuaSL6W+V8Ao ztOQ== X-Gm-Message-State: AOAM530OdgSFbVt0nR23yl6ZGKQTaa1YUBLfUTdAtP9eSMsrtcHJf8/k Cm0dcVfK5i0tetEP4LxBLg2o0V0vQ10= X-Google-Smtp-Source: ABdhPJz3FONSPhQxO5T6DyJxUgQRZmf7fYeBLgnEsyxJ2Tea78qjXneBmI2jL5Li86iWsOSo4dGSIQ== X-Received: by 2002:adf:bd86:: with SMTP id l6mr5244219wrh.205.1603740781692; Mon, 26 Oct 2020 12:33:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x18sm25951126wrg.4.2020.10.26.12.33.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:33:01 -0700 (PDT) Message-Id: <7ee7b4e9e67378539ddcd081f7967128f4e47350.1603740773.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:52 +0000 Subject: [PATCH 09/10] t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati Allows for simple perf comparison of different integrations. I ran it to compare our perl script w/ rs-git-fsmonitor and found 20-30ms of overhead on every command. Output looks like this (extra newlines added for readability) Test this tree --------------------------------------------------------------------------- 7519.4: status (fsmonitor=query-watchman) 0.42(0.37+0.05) 7519.5: status -uno (fsmonitor=query-watchman) 0.19(0.12+0.07) 7519.6: status -uall (fsmonitor=query-watchman) 1.36(0.73+0.62) 7519.7: diff (fsmonitor=query-watchman) 0.14(0.09+0.05) 7519.8: diff -- 0_files (fsmonitor=query-watchman) 0.14(0.11+0.03) 7519.9: diff -- 10_files (fsmonitor=query-watchman) 0.14(0.10+0.04) 7519.10: diff -- 100_files (fsmonitor=query-watchman) 0.14(0.09+0.05) 7519.11: diff -- 1000_files (fsmonitor=query-watchman) 0.14(0.08+0.06) 7519.12: diff -- 10000_files (fsmonitor=query-watchman) 0.14(0.09+0.05) 7519.13: add (fsmonitor=query-watchman) 2.04(1.32+0.66) 7519.16: status (fsmonitor=rs-git-fsmonitor) 0.39(0.32+0.08) 7519.17: status -uno (fsmonitor=rs-git-fsmonitor) 0.17(0.11+0.06) 7519.18: status -uall (fsmonitor=rs-git-fsmonitor) 1.33(0.71+0.61) 7519.19: diff (fsmonitor=rs-git-fsmonitor) 0.11(0.07+0.04) 7519.20: diff -- 0_files (fsmonitor=rs-git-fsmonitor) 0.11(0.09+0.03) 7519.21: diff -- 10_files (fsmonitor=rs-git-fsmonitor) 0.11(0.09+0.03) 7519.22: diff -- 100_files (fsmonitor=rs-git-fsmonitor) 0.11(0.07+0.04) 7519.23: diff -- 1000_files (fsmonitor=rs-git-fsmonitor) 0.11(0.06+0.06) 7519.24: diff -- 10000_files (fsmonitor=rs-git-fsmonitor) 0.11(0.06+0.06) 7519.25: add (fsmonitor=rs-git-fsmonitor) 2.03(1.28+0.69) 7519.28: status (fsmonitor=disabled) 0.77(0.59+0.99) 7519.29: status -uno (fsmonitor=disabled) 0.42(0.33+0.85) 7519.30: status -uall (fsmonitor=disabled) 1.59(1.02+1.34) 7519.31: diff (fsmonitor=disabled) 0.35(0.30+0.81) 7519.32: diff -- 0_files (fsmonitor=disabled) 0.11(0.08+0.04) 7519.33: diff -- 10_files (fsmonitor=disabled) 0.11(0.07+0.04) 7519.34: diff -- 100_files (fsmonitor=disabled) 0.11(0.08+0.03) 7519.35: diff -- 1000_files (fsmonitor=disabled) 0.11(0.10+0.02) 7519.36: diff -- 10000_files (fsmonitor=disabled) 0.12(0.07+0.06) 7519.37: add (fsmonitor=disabled) 2.24(1.48+1.44) Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 51c03a2596..577f79d455 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -22,7 +22,9 @@ test_description="Test core.fsmonitor" # # GIT_PERF_7519_UNTRACKED_CACHE: used to configure core.untrackedCache # GIT_PERF_7519_SPLIT_INDEX: used to configure core.splitIndex -# GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor +# GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor. May be an +# absolute path to an integration. May be a space delimited list of +# absolute paths to integrations. # # The big win for using fsmonitor is the elimination of the need to scan the # working directory looking for changed and untracked files. If the file @@ -105,9 +107,9 @@ test_expect_success "one time repo setup" ' setup_for_fsmonitor() { # set INTEGRATION_SCRIPT depending on the environment - if test -n "$GIT_PERF_7519_FSMONITOR" + if test -n "$INTEGRATION_PATH" then - INTEGRATION_SCRIPT="$GIT_PERF_7519_FSMONITOR" + INTEGRATION_SCRIPT="$INTEGRATION_PATH" else # # Choose integration script based on existence of Watchman. @@ -192,11 +194,15 @@ test_fsmonitor_suite() { ' } -test_expect_success "setup for fsmonitor" ' - setup_for_fsmonitor -' - -test_fsmonitor_suite +if test -n "$GIT_PERF_7519_FSMONITOR"; then + for INTEGRATION_PATH in $GIT_PERF_7519_FSMONITOR; do + test_expect_success "setup for fsmonitor $INTEGRATION_PATH" 'setup_for_fsmonitor' + test_fsmonitor_suite + done +else + test_expect_success "setup for fsmonitor" 'setup_for_fsmonitor' + test_fsmonitor_suite +fi test_expect_success "setup without fsmonitor" ' unset INTEGRATION_SCRIPT && From patchwork Mon Oct 26 19:32:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipunn Koorapati X-Patchwork-Id: 11858525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E926C56202 for ; Mon, 26 Oct 2020 19:33:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50E7E2085B for ; Mon, 26 Oct 2020 19:33:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mc1Zcbjy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1793212AbgJZTdG (ORCPT ); Mon, 26 Oct 2020 15:33:06 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:40589 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793198AbgJZTdE (ORCPT ); Mon, 26 Oct 2020 15:33:04 -0400 Received: by mail-wm1-f68.google.com with SMTP id k18so13652402wmj.5 for ; Mon, 26 Oct 2020 12:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=fTu+ikldQcPlNnRXrfMHKhzqWXN5I0TZ6MFtQU9jbUY=; b=mc1Zcbjykrg5rC0VqWvbB1+dMnDGjrGCjHzmJf6bDOja5lVBT1whQ+V+RP/+FegKSY 79ii71S6qe7wXQLtabgaXKNmUhhqnF2RXKhUYQ3Ek00hLtkkf5EN0ozbd2TR80c6fbqL zrlHy58gSUarNmwe0shfzn2rIqMOmIZV9N/+8MYYygbNzeiwyFWz0oVR9vqktRrk0TxI RImRQa+VFSvEUgK5plzx+2oSVQCUYbAVaU+nUZh16YYaeFYwRPjoeO/KjrDc8LkBPyTL 7wnDdrG7Fd0yYSlv4vkoVL5nyf4qjY4Vr8RoxFFuKv2p/tYPEdVNb+u1HYUGVFFMYyQY jn0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=fTu+ikldQcPlNnRXrfMHKhzqWXN5I0TZ6MFtQU9jbUY=; b=Iy7AeocfXwe/XnN8XlyXHI3xq9kH6ouy/gwsqEDKOXYLR8asL5LLwfYmmWKTI1XA2c BF4oWvF6JuUCxpnRiyMoiisuSxw+JddNwv1nH8v4DnYyxSQyN4yfQNCur/kFhtt2QP// BYAX1PuGEW5Jr3i7ShkMsBYgiyU+blhD1BomVEPpaDPMM3JctG0wW4Q+PyIiNm9Qx7M9 9ryWKr3T26wYB2wVkjZMq1UUa+wE3vUpJ8TBWzq4Q3KV4LUwW48OrLW/hZLpJD4/IlvG TtUWlL8E39niAo//dWUCS/wJTLUWyKT+cYGt7nshUoTtLqxu1Kx0CqoZ9l+jDrDHoho3 lYxw== X-Gm-Message-State: AOAM531hTPaDtm5taR7tAY0S3jRk8Ap7MzxaBWMMCZsg4gqneo17DprF HeH/Ib9C+VVCteVffwb76tZZPYDQ668= X-Google-Smtp-Source: ABdhPJzfAFa2aL98Zzy0MY0bWeZQSki4m3Kv6zUI2MAigMK9rpxpQ08TpWeKxi1Vp34XElr6arTD0Q== X-Received: by 2002:a1c:3c4:: with SMTP id 187mr12500233wmd.14.1603740782374; Mon, 26 Oct 2020 12:33:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y201sm10582179wmd.27.2020.10.26.12.33.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 12:33:01 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 26 Oct 2020 19:32:53 +0000 Subject: [PATCH 10/10] t/perf/fsmonitor: add benchmark for dirty status Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Nipunn Koorapati , Nipunn Koorapati Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Nipunn Koorapati From: Nipunn Koorapati This benchmark covers the git status time for a heavily dirty directory - benchmarking fsmonitor's refresh When running to compare our perl vs rs-git-fsmonitor - we see that the perl script incurs significant overhead - further motivation to provide a faster implementation within git. 7519.7: status (dirty) (fsmonitor=query-watchman) 10.05(7.78+1.56) 7519.20: status (dirty) (fsmonitor=rs-git-fsmonitor) 6.72(4.37+1.64) 7519.33: status (dirty) (fsmonitor=disabled) 5.62(4.24+2.03) Signed-off-by: Nipunn Koorapati --- t/perf/p7519-fsmonitor.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 577f79d455..163a13bea3 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -165,6 +165,11 @@ test_fsmonitor_suite() { git status -uall ' + test_perf_w_drop_caches "status (dirty) ($DESC)" ' + git ls-files | head -100000 | xargs -d "\n" touch -h && + git status + ' + test_perf_w_drop_caches "diff ($DESC)" ' git diff '