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.2 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 1CA0F1F453 for ; Wed, 30 Jan 2019 20:57:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388010AbfA3U5J (ORCPT ); Wed, 30 Jan 2019 15:57:09 -0500 Received: from mail-ed1-f43.google.com ([209.85.208.43]:33248 "EHLO mail-ed1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387922AbfA3U4b (ORCPT ); Wed, 30 Jan 2019 15:56:31 -0500 Received: by mail-ed1-f43.google.com with SMTP id p6so834279eds.0 for ; Wed, 30 Jan 2019 12:56:29 -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=XtCymizwj1XYxWnQ5U84tXVndJDCA7G0G1rzgs0ilLU=; b=B3ln/OAAr+vOT0IEOR1Ll0ZEZcsW1CJOVRZ2RGB/a/N4NUCXnUjz7dakATAlbIYOUi APf1nTPE7341Z/2NfJ6w50wFqfCKwOqi9i63VpHYojQk5LQAYBK8letg9Oav26w7Gpjf YkvUHE8TXUBhfAAvQz3m0LyXKnWG/+7j+NNoOYY9bP7Za8FE4koRspNobabkl+eQIuo4 l9YMbOIU588hPO+RlCv6VKiBQ5ah92so8LdMnRCYYD34fgKpLKT3KQJrbbiyu/ta81GP 7RcSFFX9caZnuEDirJfvAfv8bcY0RfdMTobIHpp+nflUYqC5UlNaEGW/pmlsl3X1rVFE IDhA== 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=XtCymizwj1XYxWnQ5U84tXVndJDCA7G0G1rzgs0ilLU=; b=dSmtqE1hgqed0+MZXGyu6KhoIy62Sgyc4a18ZYrtuf4HrbdeLfMNXGMkyqSGxEE1HO GvLD3tIwXxaYtji9pcVarPRsQ4b2UQYhYALeq1KLF5ISn1b5+08AndmQ/aZEbRaBnMyG +/ZfRzfzdX/p1FT7MLzBDFvL85ABwnRLZUBnaY5X6W/87n8iT778uhrKn3jLJL2Xux7R 6fDXUMc5GY65eHblbILfh8B1V6cHgz47QuL8ah2HwdKmeXOm6iRySq8wyJm8gx4iDtww Aokt7S7A9Dd4CcVjHoy6TqhuQLH4Q4cYhq/+UJEZHr+VFb/oyP2lMxZe3Z7kROSec4+t 9SoA== X-Gm-Message-State: AJcUukflBNEqSuhuvH08IYFk5q3uNkJ01f3RU4/9eZqJvQ01KQbWe7nA nfY9f2g5v313mHJQfp+XINoEZNHE X-Google-Smtp-Source: ALg8bN4dKQYoHrVq3w/9psgWL32PAcuoz8IFzDSORP3yQgFDsw9NgV2i8mYcbmL1iB0M2sARKZDvrQ== X-Received: by 2002:a50:8343:: with SMTP id 61mr31616825edh.154.1548881788892; Wed, 30 Jan 2019 12:56:28 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a11sm793334edc.28.2019.01.30.12.56.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 12:56:28 -0800 (PST) Date: Wed, 30 Jan 2019 12:56:28 -0800 (PST) X-Google-Original-Date: Wed, 30 Jan 2019 20:56:13 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v4 08/14] trace2:data: add trace2 hook classification 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 Classify certain child processes as hooks. Signed-off-by: Jeff Hostetler --- builtin/am.c | 1 + builtin/receive-pack.c | 4 ++++ builtin/worktree.c | 1 + sequencer.c | 2 ++ transport.c | 1 + 5 files changed, 9 insertions(+) diff --git a/builtin/am.c b/builtin/am.c index 95370313b6..a81e61c1bc 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -468,6 +468,7 @@ static int run_post_rewrite_hook(const struct am_state *state) cp.in = xopen(am_path(state, "rewritten"), O_RDONLY); cp.stdout_to_stderr = 1; + cp.trace2_hook_name = "post-rewrite"; ret = run_command(&cp); diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 33187bd8e9..6eef8575b9 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -694,6 +694,8 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, proc.argv = argv; proc.in = -1; proc.stdout_to_stderr = 1; + proc.trace2_hook_name = hook_name; + if (feed_state->push_options) { int i; for (i = 0; i < feed_state->push_options->nr; i++) @@ -807,6 +809,7 @@ static int run_update_hook(struct command *cmd) proc.stdout_to_stderr = 1; proc.err = use_sideband ? -1 : 0; proc.argv = argv; + proc.trace2_hook_name = "update"; code = start_command(&proc); if (code) @@ -1190,6 +1193,7 @@ static void run_update_post_hook(struct command *commands) proc.no_stdin = 1; proc.stdout_to_stderr = 1; proc.err = use_sideband ? -1 : 0; + proc.trace2_hook_name = "post-update"; if (!start_command(&proc)) { if (use_sideband) diff --git a/builtin/worktree.c b/builtin/worktree.c index 3f9907fcc9..6cc094a453 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -402,6 +402,7 @@ static int add_worktree(const char *path, const char *refname, cp.dir = path; cp.env = env; cp.argv = NULL; + cp.trace2_hook_name = "post-checkout"; argv_array_pushl(&cp.args, absolute_path(hook), oid_to_hex(&null_oid), oid_to_hex(&commit->object.oid), diff --git a/sequencer.c b/sequencer.c index 213815dbfc..c1e36196a1 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1103,6 +1103,7 @@ static int run_rewrite_hook(const struct object_id *oldoid, proc.argv = argv; proc.in = -1; proc.stdout_to_stderr = 1; + proc.trace2_hook_name = "post-rewrite"; code = start_command(&proc); if (code) @@ -3784,6 +3785,7 @@ static int pick_commits(struct repository *r, hook.in = open(rebase_path_rewritten_list(), O_RDONLY); hook.stdout_to_stderr = 1; + hook.trace2_hook_name = "post-rewrite"; argv_array_push(&hook.args, post_rewrite_hook); argv_array_push(&hook.args, "rebase"); /* we don't care if this hook failed */ diff --git a/transport.c b/transport.c index 99678153c1..ed5a733c4a 100644 --- a/transport.c +++ b/transport.c @@ -1061,6 +1061,7 @@ static int run_pre_push_hook(struct transport *transport, proc.argv = argv; proc.in = -1; + proc.trace2_hook_name = "pre-push"; if (start_command(&proc)) { finish_command(&proc); -- gitgitgadget