From: Junio C Hamano <gitster@pobox.com>
To: "Harshil-Jani via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Harshil Jani <harshiljani2002@gmail.com>
Subject: Re: [PATCH 1/2] mingw: remove duplicate `USE_NED_ALLOCATOR` directive
Date: Sun, 18 Dec 2022 10:54:57 +0900 [thread overview]
Message-ID: <xmqq1qoxzdam.fsf@gitster.g> (raw)
In-Reply-To: <bc79dfcc4d44e0f006dc64d75a2c7f8a11834229.1670274213.git.gitgitgadget@gmail.com> (Harshil-Jani via GitGitGadget's message of "Mon, 05 Dec 2022 21:03:32 +0000")
"Harshil-Jani via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Harshil-Jani <harshiljani2002@gmail.com>
>
> nedalloc was added to fix the slowness of memory allocator. Here
> specifically for the MSys2 build there seems to be a duplication of
> USE_NED_ALLOCATOR directive.
Yes, if your platform's "uname -S" says "MINGW", your build is done
in a directory with ../THIS_IS_MSYSGIT marker file, and your "uname -R"
does not begin with "1.", then there are two USE_NED_ALLOCATOR=YesPlease
in effect.
> So this patch intends to remove the
> duplicate USE_NED_ALLOCATOR and keeping it only into the MSys2 config
> section so it still uses the nedalloc.
What about other folks whose "uname -S" says "MINGW"?
> Signed-off-by: Harshil-Jani <harshiljani2002@gmail.com>
> ---
> config.mak.uname | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/config.mak.uname b/config.mak.uname
> index d63629fe807..377667c4bbc 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -652,7 +652,6 @@ ifeq ($(uname_S),MINGW)
> USE_WIN32_IPC = YesPlease
> USE_WIN32_MMAP = YesPlease
> MMAP_PREVENTS_DELETE = UnfortunatelyYes
> - USE_NED_ALLOCATOR = YesPlease
> UNRELIABLE_FSTAT = UnfortunatelyYes
> OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
> NO_REGEX = YesPlease
The original in a wider context looks like this:
ifeq ($(uname_S),MINGW)
...
MMAP_PREVENTS_DELETE = UnfortunatelyYes
USE_NED_ALLOCATOR = YesPlease
UNRELIABLE_FSTAT = UnfortunatelyYes
...
X = .exe
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
htmldir = doc/git/html/
...
COMPAT_CFLAGS += -D__USE_MINGW_ACCESS
else
ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
# MSys2
...
USE_LIBPCRE = YesPlease
USE_NED_ALLOCATOR = YesPlease
ifeq (/mingw64,$(subst 32,64,$(prefix)))
# Move system config into top-level /etc/
...
endif
else
...
endif
endif
endif
With this patch, a build that has ../THIS_IS_MSYSGIT marker file, or
whose "uname -R" output begins with "1.", will no longer get
USE_NED_ALLOCATOR. Intended?
Without knowing much about the Windows/MSYS/Git for Windows SDK
ecosystem, it is the inner one that looks duplicated, but the patch
is removing the outer one that helps every platform whose "uname -S"
identifies it as MINGW.
Perhaps that is what the patch meant to do, but then the proposed
log message explains it very differently. It only talks about the
no-op case. It does not explain why other folks whose "uname -S"
says MINGW (1) are not broken if this patch suddenly robs NED
allocator from them, and (2) are better off without using NED
allocator.
next prev parent reply other threads:[~2022-12-18 1:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-05 21:03 [PATCH 0/2] Remove MSys Support Harshil Jani via GitGitGadget
2022-12-05 21:03 ` [PATCH 1/2] mingw: remove duplicate `USE_NED_ALLOCATOR` directive Harshil-Jani via GitGitGadget
2022-12-18 1:54 ` Junio C Hamano [this message]
2022-12-05 21:03 ` [PATCH 2/2] mingw: remove msysGit/MSYS1 support Harshil-Jani via GitGitGadget
2022-12-18 2:11 ` Junio C Hamano
2022-12-18 3:58 ` Junio C Hamano
2023-01-09 7:48 ` Johannes Schindelin
2023-01-09 8:52 ` Junio C Hamano
2022-12-18 2:15 ` [PATCH 0/2] Remove MSys Support Junio C Hamano
2023-01-09 7:36 ` Johannes Schindelin
2023-01-09 8:49 ` Junio C Hamano
2023-02-02 3:51 ` [PATCH v2 " Harshil Jani via GitGitGadget
2023-02-02 3:51 ` [PATCH v2 1/2] mingw: remove duplicate `USE_NED_ALLOCATOR` directive Harshil-Jani via GitGitGadget
2023-02-02 3:51 ` [PATCH v2 2/2] mingw: remove msysGit/MSYS1 support Harshil-Jani via GitGitGadget
2023-02-02 13:59 ` [PATCH v2 0/2] Remove MSys Support Johannes Schindelin
2023-02-02 16:06 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq1qoxzdam.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=harshiljani2002@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).