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.0 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, SPF_HELO_NONE,SPF_NONE 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 EB17E1F4C0 for ; Wed, 16 Oct 2019 12:06:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389491AbfJPMG7 (ORCPT ); Wed, 16 Oct 2019 08:06:59 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39091 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388546AbfJPMG6 (ORCPT ); Wed, 16 Oct 2019 08:06:58 -0400 Received: by mail-wm1-f68.google.com with SMTP id v17so2474110wml.4 for ; Wed, 16 Oct 2019 05:06: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:mime-version :content-transfer-encoding:fcc:to:cc; bh=38r/UVhjG5EsDsuddd2xDseECchSBL3SYD5WQz7alHQ=; b=QLS/c5IRf/va5vUi8xydUR3k4B3FJ/jFp/O87myReW5/v6oP0TbIwqZnevj0hX7+TX JIzBxrnS0/r0cK1XAqBzC93MnkMRIXQHXUOU8zmA5zL3JpGh0aNHT3PdTftvVD9tF7cF JKEii9MLHkJXHezM8eO3MwthoDNVm4bt1M2f9vYF49OrruQw4rMAvDfZYYF/B9qYa4wz 2RypFMYcf4nUAdAmN+yTUppvwb7HK6vxV/Nvf4zpZYxfA5oHzNrERhN6cv5zY0CclVhy dFjkHx2g981XJ9BgCdsflrY3iTTpi5uPpzGhSlTf5VFUZMv2vB9vfU4e6DRUJt2Y84CF 7gNA== 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:mime-version:content-transfer-encoding:fcc:to:cc; bh=38r/UVhjG5EsDsuddd2xDseECchSBL3SYD5WQz7alHQ=; b=QofSqfcHNEq/LFej43qVIO90WU+scj3zAWpTdqJQzWb1ePSuRgq13SCNGdNXR+Br/2 COhHOOmQ6RWcIyNkgykJyLG4aSMwcWTm/kjZw9Gjjw2IFRF/Cx2jm9KGWgUWFFnygUhy ivpIs/+tI34oOW9cwCdhvFG/bT7NDaa7NND3saqdVLOk+it/C4nifvoWXuqibMaOrggy tkzuCmkml9++PbicbdCKDNGFeL1ME5QIns9q3zMQjvHX9hmbJYF6+JkeaDaQex0wlwa3 JkPV4A9r+qvDOFbwQBzwhZEKTUch/hB6hZuci2GiGhdC8KGRZcVYvkG/Cn6eeRrM4mFj 4IxQ== X-Gm-Message-State: APjAAAUkQam1AmCynE7kv23N0BMddZumbb3GYEnZHI97Ni8Mtn9WTgVB ECB9BaqbcSgjZesPZnoUXMaCNaeN X-Google-Smtp-Source: APXvYqzXn9ewKwXmdCUug61pbRRqpHUKpgMPEd6nIaCweKAw7WDh3h8Jfc1IN36CC+UJz90ZWceQUg== X-Received: by 2002:a1c:a8c9:: with SMTP id r192mr3160373wme.152.1571227616516; Wed, 16 Oct 2019 05:06:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h7sm22994472wrs.15.2019.10.16.05.06.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Oct 2019 05:06:56 -0700 (PDT) Message-Id: <191d3a2280232ff98964fd42bfe0bc85ee3708f5.1571227613.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "=?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= via GitGitGadget" Date: Wed, 16 Oct 2019 12:06:52 +0000 Subject: [PATCH 2/3] grep: make PCRE2 aware of custom allocator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcc: Sent To: git@vger.kernel.org Cc: Carlo Marcelo Arenas =?UTF-8?Q?Bel=C3=B3n?= , Johannes Schindelin , Junio C Hamano , =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= 94da9193a6 (grep: add support for PCRE v2, 2017-06-01) didn't include a way to override the system allocator, and so it is incompatible with custom allocators (e.g. nedmalloc). This problem became obvious when we tried to plug a memory leak by `free()`ing a data structure allocated by PCRE2, triggering a segfault in Windows (where we use nedmalloc by default). PCRE2 requires the use of a general context to override the allocator and therefore, there is a lot more code needed than in PCRE1, including a couple of wrapper functions. Extend the grep API with a "destructor" that could be called to cleanup any objects that were created and used globally. Update `builtin/grep.c` to use that new API, but any other future users should make sure to have matching `grep_init()`/`grep_destroy()` calls if they are using the pattern matching functionality. Move some of the logic that was before done per thread (in the workers) into an earlier phase to avoid degrading performance, but as the use of PCRE2 with custom allocators is better understood it is expected more of its functions will be instructed to use the custom allocator as well as was done in the original code[1] this work was based on. [1] https://public-inbox.org/git/3397e6797f872aedd18c6d795f4976e1c579514b.1565005867.git.gitgitgadget@gmail.com/ Reported-by: Johannes Schindelin Signed-off-by: Carlo Marcelo Arenas Belón Signed-off-by: Johannes Schindelin --- builtin/grep.c | 1 + grep.c | 34 +++++++++++++++++++++++++++++++++- grep.h | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/builtin/grep.c b/builtin/grep.c index 560051784e..e49c20df60 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1145,5 +1145,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix) run_pager(&opt, prefix); clear_pathspec(&pathspec); free_grep_patterns(&opt); + grep_destroy(); return !hit; } diff --git a/grep.c b/grep.c index db6e0d895f..296edbb56f 100644 --- a/grep.c +++ b/grep.c @@ -16,6 +16,20 @@ static int grep_source_is_binary(struct grep_source *gs, static struct grep_opt grep_defaults; +#ifdef USE_LIBPCRE2 +static pcre2_general_context *pcre2_global_context; + +static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data) +{ + return malloc(size); +} + +static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data) +{ + return free(pointer); +} +#endif + static const char *color_grep_slots[] = { [GREP_COLOR_CONTEXT] = "context", [GREP_COLOR_FILENAME] = "filename", @@ -153,12 +167,20 @@ int grep_config(const char *var, const char *value, void *cb) * * If using PCRE, make sure that the library is configured * to use the same allocator as Git (e.g. nedmalloc on Windows). + * + * Any allocated memory needs to be released in grep_destroy(). */ void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix) { struct grep_opt *def = &grep_defaults; int i; +#if defined(USE_LIBPCRE2) + if (!pcre2_global_context) + pcre2_global_context = pcre2_general_context_create( + pcre2_malloc, pcre2_free, NULL); +#endif + #ifdef USE_LIBPCRE1 pcre_malloc = malloc; pcre_free = free; @@ -186,6 +208,13 @@ void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix color_set(opt->colors[i], def->colors[i]); } +void grep_destroy(void) +{ +#ifdef USE_LIBPCRE2 + pcre2_general_context_free(pcre2_global_context); +#endif +} + static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, struct grep_opt *opt) { /* @@ -505,9 +534,12 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt p->pcre2_compile_context = NULL; + /* pcre2_global_context is initialized in append_grep_pattern */ if (opt->ignore_case) { if (has_non_ascii(p->pattern)) { - character_tables = pcre2_maketables(NULL); + if (!pcre2_global_context) + BUG("pcre2_global_context uninitialized"); + character_tables = pcre2_maketables(pcre2_global_context); p->pcre2_compile_context = pcre2_compile_context_create(NULL); pcre2_set_character_tables(p->pcre2_compile_context, character_tables); } diff --git a/grep.h b/grep.h index 1875880f37..526c2db9ef 100644 --- a/grep.h +++ b/grep.h @@ -189,6 +189,7 @@ struct grep_opt { void init_grep_defaults(struct repository *); int grep_config(const char *var, const char *value, void *); void grep_init(struct grep_opt *, struct repository *repo, const char *prefix); +void grep_destroy(void); void grep_commit_pattern_type(enum grep_pattern_type, struct grep_opt *opt); void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t); -- gitgitgadget