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.3 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 5DCF21F453 for ; Wed, 6 Feb 2019 17:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731532AbfBFRP7 (ORCPT ); Wed, 6 Feb 2019 12:15:59 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:39080 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727218AbfBFRP6 (ORCPT ); Wed, 6 Feb 2019 12:15:58 -0500 Received: by mail-ed1-f67.google.com with SMTP id b14so6529514edt.6 for ; Wed, 06 Feb 2019 09:15:56 -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=6djYe7/03CUDTr2kWoKpxarC+toKY46tdt8i8EI49jQ=; b=tHtuaktIPTGM9JmWeVyX/0MNPnZaNKSSN/0yisPdSdBL7hHVx2h6cgEjYMW27TLRRA +7wN1/CjPdsgYkrIJrXIzYHk8sAAsDf8pAucoEFRE7T141kYXd/6Qa8ytC1UhDjep1LQ yWIcRoJaOtmckBLNVvyeLrmzLWScK7eaLJyN/iTXfs63a2r5ETctt5M30PDOI7QctV9U cDNCa55f4LJAEhdNbE6riRSYX7uZsGCAvwOTVb/ju2jdEdPTzyWkfK6CsjPI00th/7Dp pcWwsiah9AkfNZgH+/QNdLmoFpu9csKIXGhYQKAm/JUiH6G3o5OvueDt5J3WwGZ/8Isv CCEA== 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=6djYe7/03CUDTr2kWoKpxarC+toKY46tdt8i8EI49jQ=; b=JJrPZP6dAwXdbZHlg9QW/+5JogLmbuKO4mLSFwvIC4x3Au57A9tmF0RO9Pe9U/AMIc Iuw6whf3PnmfX0zMIrEhPb54KQrzH63jbkcoEy2R1rt2htqEwPejMpsfeC2JivvHPTP9 dHveikkUedfocB0wzZDPCvuLoc56UJxLBqm4H1AQO1svVKTlBtLyK17lubY2PlIlMunm 8QHbANKpJxqcIpyYcMDhD6bFbu6v5fEqYNfy1/mQzqIxTu2qVQ3zafw6FEKPD7peoBRl CwaJGagGSCURtc4GnHghRzSOJXoHVk6Q7xXGM17jts/icXmGxNHlStC4Od9l4ZvhMHbg 1Mtg== X-Gm-Message-State: AHQUAuajii++Arvkf4cBriH6frxlH6rKePb5qSnw/Y6nIPcTpl6t/4Zc RGtGo9C7p4k+ZPCiOBGG0SZZXfla X-Google-Smtp-Source: AHgI3IZAnb6PpjdCPVa10XtTak6mzahUFXNrZBg+vafaPO7pb6lC4o5XDlWQYBlXTWYQ+NRU2vCIaQ== X-Received: by 2002:a17:906:6dd5:: with SMTP id j21mr8207856ejt.13.1549473356017; Wed, 06 Feb 2019 09:15:56 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s2sm1510526eda.80.2019.02.06.09.15.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Feb 2019 09:15:55 -0800 (PST) Date: Wed, 06 Feb 2019 09:15:55 -0800 (PST) X-Google-Original-Date: Wed, 06 Feb 2019 17:15:38 GMT Message-Id: <12de7e42decb26fa665b742532b89dbe3ab925bd.1549473350.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v6 03/15] trace2: collect Windows-specific process information 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 platform-specific interface to log information about the current process. On Windows, this interface is used to indicate whether the git process is running under a debugger and list names of the process ancestors. Information for other platforms is left for a future effort. Signed-off-by: Jeff Hostetler --- common-main.c | 1 + compat/win32/trace2_win32_process_info.c | 101 +++++++++++++++++++++++ config.mak.uname | 2 + trace2.h | 14 ++++ 4 files changed, 118 insertions(+) create mode 100644 compat/win32/trace2_win32_process_info.c diff --git a/common-main.c b/common-main.c index 6dbdc4adf2..d484aec209 100644 --- a/common-main.c +++ b/common-main.c @@ -37,6 +37,7 @@ int main(int argc, const char **argv) trace2_initialize(); trace2_cmd_start(argv); + trace2_collect_process_info(); git_resolve_executable_dir(argv[0]); diff --git a/compat/win32/trace2_win32_process_info.c b/compat/win32/trace2_win32_process_info.c new file mode 100644 index 0000000000..253199f812 --- /dev/null +++ b/compat/win32/trace2_win32_process_info.c @@ -0,0 +1,101 @@ +#include "../../cache.h" +#include "../../json-writer.h" +#include +#include + +/* + * Find the process data for the given PID in the given snapshot + * and update the PROCESSENTRY32 data. + */ +static int find_pid(DWORD pid, HANDLE hSnapshot, PROCESSENTRY32 *pe32) +{ + pe32->dwSize = sizeof(PROCESSENTRY32); + + if (Process32First(hSnapshot, pe32)) { + do { + if (pe32->th32ProcessID == pid) + return 1; + } while (Process32Next(hSnapshot, pe32)); + } + return 0; +} + +/* + * Accumulate JSON array: + * [ + * exe-name-parent, + * exe-name-grand-parent, + * ... + * ] + * + * Note: we only report the filename of the process executable; the + * only way to get its full pathname is to use OpenProcess() + * and GetModuleFileNameEx() or QueryfullProcessImageName() + * and that seems rather expensive (on top of the cost of + * getting the snapshot). + */ +static void get_processes(struct json_writer *jw, HANDLE hSnapshot) +{ + PROCESSENTRY32 pe32; + DWORD pid; + + pid = GetCurrentProcessId(); + + /* We only want parent processes, so skip self. */ + if (!find_pid(pid, hSnapshot, &pe32)) + return; + pid = pe32.th32ParentProcessID; + + while (find_pid(pid, hSnapshot, &pe32)) { + jw_array_string(jw, pe32.szExeFile); + + pid = pe32.th32ParentProcessID; + } +} + +/* + * Emit JSON data for the current and parent processes. Individual + * trace2 targets can decide how to actually print it. + */ +static void get_ancestry(void) +{ + HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + + if (hSnapshot != INVALID_HANDLE_VALUE) { + struct json_writer jw = JSON_WRITER_INIT; + + jw_array_begin(&jw, 0); + get_processes(&jw, hSnapshot); + jw_end(&jw); + + trace2_data_json("process", the_repository, "windows/ancestry", + &jw); + + jw_release(&jw); + CloseHandle(hSnapshot); + } +} + +/* + * Is a debugger attached to the current process? + * + * This will catch debug runs (where the debugger started the process). + * This is the normal case. Since this code is called during our startup, + * it will not report instances where a debugger is attached dynamically + * to a running git process, but that is relatively rare. + */ +static void get_is_being_debugged(void) +{ + if (IsDebuggerPresent()) + trace2_data_intmax("process", the_repository, + "windows/debugger_present", 1); +} + +void trace2_collect_process_info(void) +{ + if (!trace2_is_enabled()) + return; + + get_is_being_debugged(); + get_ancestry(); +} diff --git a/config.mak.uname b/config.mak.uname index 7b36a1dfe7..a3c03ce2ae 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -391,6 +391,7 @@ ifeq ($(uname_S),Windows) BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE COMPAT_OBJS = compat/msvc.o compat/winansi.o \ compat/win32/pthread.o compat/win32/syslog.o \ + compat/win32/trace2_win32_process_info.o \ compat/win32/dirent.o COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\" BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE @@ -545,6 +546,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32 COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_OBJS += compat/mingw.o compat/winansi.o \ + compat/win32/trace2_win32_process_info.o \ compat/win32/path-utils.o \ compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/dirent.o diff --git a/trace2.h b/trace2.h index fce9891f53..ae5020d0e6 100644 --- a/trace2.h +++ b/trace2.h @@ -368,4 +368,18 @@ void trace2_printf(const char *fmt, ...); /* clang-format on */ #endif +/* + * Optional platform-specific code to dump information about the + * current and any parent process(es). This is intended to allow + * post-processors to know who spawned this git instance and anything + * else the platform may be able to tell us about the current process. + */ +#if defined(GIT_WINDOWS_NATIVE) +void trace2_collect_process_info(void); +#else +#define trace2_collect_process_info() \ + do { \ + } while (0) +#endif + #endif /* TRACE2_H */ -- gitgitgadget