* Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation
2018-04-30 14:26 [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation Ben Peart
@ 2018-04-30 14:57 ` Duy Nguyen
2018-04-30 15:17 ` Ben Peart
2018-04-30 17:05 ` Eric Sunshine
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Duy Nguyen @ 2018-04-30 14:57 UTC (permalink / raw)
To: Ben Peart; +Cc: git@vger.kernel.org, johannes.schindelin@gmx.de
On Mon, Apr 30, 2018 at 4:26 PM, Ben Peart <Ben.Peart@microsoft.com> wrote:
> Take advantage of the recent addition of support for lazy loading functions
> on Windows to simplfy the loading of NtSetSystemInformation.
>
> Signed-off-by: Ben Peart <benpeart@microsoft.com>
> ---
>
> Notes:
> Base Ref: master
> Web-Diff: https://github.com/benpeart/git/commit/6e6ce4a788
> Checkout: git fetch https://github.com/benpeart/git test-drop-caches-v1 && git checkout 6e6ce4a788
>
> t/helper/test-drop-caches.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c
> index 838760898b..dd41da1a2c 100644
> --- a/t/helper/test-drop-caches.c
> +++ b/t/helper/test-drop-caches.c
> @@ -1,5 +1,6 @@
> #include "test-tool.h"
> #include "git-compat-util.h"
> +#include "lazyload.h"
This is in compat/win32, should it be inside the "if defined
(GIT_WINDOWS_NATIVE)" block instead of here?
>
> #if defined(GIT_WINDOWS_NATIVE)
>
> @@ -82,8 +83,6 @@ static int cmd_dropcaches(void)
> {
> HANDLE hProcess = GetCurrentProcess();
> HANDLE hToken;
> - HMODULE ntdll;
> - DWORD(WINAPI *NtSetSystemInformation)(INT, PVOID, ULONG);
> SYSTEM_MEMORY_LIST_COMMAND command;
> int status;
>
> @@ -95,14 +94,9 @@ static int cmd_dropcaches(void)
>
> CloseHandle(hToken);
>
> - ntdll = LoadLibrary("ntdll.dll");
> - if (!ntdll)
> - return error("Can't load ntdll.dll, wrong Windows version?");
> -
> - NtSetSystemInformation =
> - (DWORD(WINAPI *)(INT, PVOID, ULONG))GetProcAddress(ntdll, "NtSetSystemInformation");
> - if (!NtSetSystemInformation)
> - return error("Can't get function addresses, wrong Windows version?");
> + DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
> + if (!INIT_PROC_ADDR(NtSetSystemInformation))
> + return error("Could not find NtSetSystemInformation() function");
>
> command = MemoryPurgeStandbyList;
> status = NtSetSystemInformation(
> @@ -115,8 +109,6 @@ static int cmd_dropcaches(void)
> else if (status != STATUS_SUCCESS)
> error("Unable to execute the memory list command %d", status);
>
> - FreeLibrary(ntdll);
> -
> return status;
> }
>
>
> base-commit: 1f1cddd558b54bb0ce19c8ace353fd07b758510d
> --
> 2.17.0.windows.1
>
--
Duy
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation
2018-04-30 14:57 ` Duy Nguyen
@ 2018-04-30 15:17 ` Ben Peart
0 siblings, 0 replies; 9+ messages in thread
From: Ben Peart @ 2018-04-30 15:17 UTC (permalink / raw)
To: Duy Nguyen, Ben Peart; +Cc: git@vger.kernel.org, johannes.schindelin@gmx.de
On 4/30/2018 10:57 AM, Duy Nguyen wrote:
> On Mon, Apr 30, 2018 at 4:26 PM, Ben Peart <Ben.Peart@microsoft.com> wrote:
>> Take advantage of the recent addition of support for lazy loading functions
>> on Windows to simplfy the loading of NtSetSystemInformation.
>>
>> Signed-off-by: Ben Peart <benpeart@microsoft.com>
>> ---
>>
>> Notes:
>> Base Ref: master
>> Web-Diff: https://github.com/benpeart/git/commit/6e6ce4a788
>> Checkout: git fetch https://github.com/benpeart/git test-drop-caches-v1 && git checkout 6e6ce4a788
>>
>> t/helper/test-drop-caches.c | 16 ++++------------
>> 1 file changed, 4 insertions(+), 12 deletions(-)
>>
>> diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c
>> index 838760898b..dd41da1a2c 100644
>> --- a/t/helper/test-drop-caches.c
>> +++ b/t/helper/test-drop-caches.c
>> @@ -1,5 +1,6 @@
>> #include "test-tool.h"
>> #include "git-compat-util.h"
>> +#include "lazyload.h"
>
> This is in compat/win32, should it be inside the "if defined
> (GIT_WINDOWS_NATIVE)" block instead of here?
>
Yes, that does make sense. No other platform will need/want it. I'll
wait to see if there is any other feedback and will submit an updated
patch. Thanks for the catch.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation
2018-04-30 14:26 [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation Ben Peart
2018-04-30 14:57 ` Duy Nguyen
@ 2018-04-30 17:05 ` Eric Sunshine
2018-04-30 18:12 ` Stefan Beller
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Eric Sunshine @ 2018-04-30 17:05 UTC (permalink / raw)
To: Ben Peart
Cc: git@vger.kernel.org, pclouds@gmail.com,
johannes.schindelin@gmx.de
On Mon, Apr 30, 2018 at 10:26 AM, Ben Peart <Ben.Peart@microsoft.com> wrote:
> Take advantage of the recent addition of support for lazy loading functions
> on Windows to simplfy the loading of NtSetSystemInformation.
s/simplfy/simplify/
> Signed-off-by: Ben Peart <benpeart@microsoft.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation
2018-04-30 14:26 [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation Ben Peart
2018-04-30 14:57 ` Duy Nguyen
2018-04-30 17:05 ` Eric Sunshine
@ 2018-04-30 18:12 ` Stefan Beller
2018-04-30 18:43 ` Ben Peart
2018-04-30 19:21 ` Johannes Sixt
2018-05-01 12:46 ` [PATCH v2] " Ben Peart
4 siblings, 1 reply; 9+ messages in thread
From: Stefan Beller @ 2018-04-30 18:12 UTC (permalink / raw)
To: Ben Peart
Cc: git@vger.kernel.org, pclouds@gmail.com,
johannes.schindelin@gmx.de
On Mon, Apr 30, 2018 at 7:26 AM, Ben Peart <Ben.Peart@microsoft.com> wrote:
> Take advantage of the recent addition of support for lazy loading functions
Care to specify "recent additions"? Are these in Git code or somewhere else?
I find this alias handy, as then I can describe commits
in commit messages via "git gcs <commitish>
alias.gcs=show --date=short -s --pretty='format:%h (%s, %ad)'
Thanks,
Stefan
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation
2018-04-30 18:12 ` Stefan Beller
@ 2018-04-30 18:43 ` Ben Peart
0 siblings, 0 replies; 9+ messages in thread
From: Ben Peart @ 2018-04-30 18:43 UTC (permalink / raw)
To: Stefan Beller, Ben Peart
Cc: git@vger.kernel.org, pclouds@gmail.com,
johannes.schindelin@gmx.de
On 4/30/2018 2:12 PM, Stefan Beller wrote:
> On Mon, Apr 30, 2018 at 7:26 AM, Ben Peart <Ben.Peart@microsoft.com> wrote:
>> Take advantage of the recent addition of support for lazy loading functions
>
> Care to specify "recent additions"? Are these in Git code or somewhere else?
>
> I find this alias handy, as then I can describe commits
> in commit messages via "git gcs <commitish>
>
> alias.gcs=show --date=short -s --pretty='format:%h (%s, %ad)'
>
> Thanks,
> Stefan
>
I guess "recent" is relative. :)
db2f7c48cb (Win32: simplify loading of DLL functions, 2017-09-25)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation
2018-04-30 14:26 [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation Ben Peart
` (2 preceding siblings ...)
2018-04-30 18:12 ` Stefan Beller
@ 2018-04-30 19:21 ` Johannes Sixt
2018-05-01 12:46 ` [PATCH v2] " Ben Peart
4 siblings, 0 replies; 9+ messages in thread
From: Johannes Sixt @ 2018-04-30 19:21 UTC (permalink / raw)
To: Ben Peart
Cc: git@vger.kernel.org, pclouds@gmail.com,
johannes.schindelin@gmx.de
Am 30.04.2018 um 16:26 schrieb Ben Peart:
> @@ -82,8 +83,6 @@ static int cmd_dropcaches(void)
> {
> HANDLE hProcess = GetCurrentProcess();
> HANDLE hToken;
> - HMODULE ntdll;
> - DWORD(WINAPI *NtSetSystemInformation)(INT, PVOID, ULONG);
> SYSTEM_MEMORY_LIST_COMMAND command;
> int status;
>
> @@ -95,14 +94,9 @@ static int cmd_dropcaches(void)
>
> CloseHandle(hToken);
>
> - ntdll = LoadLibrary("ntdll.dll");
> - if (!ntdll)
> - return error("Can't load ntdll.dll, wrong Windows version?");
> -
> - NtSetSystemInformation =
> - (DWORD(WINAPI *)(INT, PVOID, ULONG))GetProcAddress(ntdll, "NtSetSystemInformation");
> - if (!NtSetSystemInformation)
> - return error("Can't get function addresses, wrong Windows version?");
> + DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
This is a declaration-after-statement. Even though this is not in
generic code, it is all too easy to trigger a warning from GCC if a
corresponding warning is turned on.
> + if (!INIT_PROC_ADDR(NtSetSystemInformation))
> + return error("Could not find NtSetSystemInformation() function");
>
> command = MemoryPurgeStandbyList;
> status = NtSetSystemInformation(
> @@ -115,8 +109,6 @@ static int cmd_dropcaches(void)
> else if (status != STATUS_SUCCESS)
> error("Unable to execute the memory list command %d", status);
>
> - FreeLibrary(ntdll);
> -
> return status;
> }
-- Hannes
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2] test-drop-caches: simplify delay loading of NtSetSystemInformation
2018-04-30 14:26 [PATCH v1] test-drop-caches: simplify delay loading of NtSetSystemInformation Ben Peart
` (3 preceding siblings ...)
2018-04-30 19:21 ` Johannes Sixt
@ 2018-05-01 12:46 ` Ben Peart
2018-05-02 6:55 ` Johannes Schindelin
4 siblings, 1 reply; 9+ messages in thread
From: Ben Peart @ 2018-05-01 12:46 UTC (permalink / raw)
To: git@vger.kernel.org
Cc: gitster@pobox.com, j6t@kdbg.org, pclouds@gmail.com,
sunshine@sunshineco.com, sbeller@google.com, Ben Peart
Take advantage of the recent addition of support for lazy loading functions[1]
on Windows to simplify the loading of NtSetSystemInformation.
[1] db2f7c48cb (Win32: simplify loading of DLL functions, 2017-09-25)
Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
Notes:
Base Ref: master
Web-Diff: https://github.com/benpeart/git/commit/3c9974548a
Checkout: git fetch https://github.com/benpeart/git test-drop-caches-v2 && git checkout 3c9974548a
### Interdiff (v1..v2):
diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c
index dd41da1a2c..d6bcfddf13 100644
--- a/t/helper/test-drop-caches.c
+++ b/t/helper/test-drop-caches.c
@@ -1,8 +1,8 @@
#include "test-tool.h"
#include "git-compat-util.h"
-#include "lazyload.h"
#if defined(GIT_WINDOWS_NATIVE)
+#include "lazyload.h"
static int cmd_sync(void)
{
@@ -83,6 +83,7 @@ static int cmd_dropcaches(void)
{
HANDLE hProcess = GetCurrentProcess();
HANDLE hToken;
+ DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
SYSTEM_MEMORY_LIST_COMMAND command;
int status;
@@ -94,7 +95,6 @@ static int cmd_dropcaches(void)
CloseHandle(hToken);
- DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
if (!INIT_PROC_ADDR(NtSetSystemInformation))
return error("Could not find NtSetSystemInformation() function");
### Patches
t/helper/test-drop-caches.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c
index 838760898b..d6bcfddf13 100644
--- a/t/helper/test-drop-caches.c
+++ b/t/helper/test-drop-caches.c
@@ -2,6 +2,7 @@
#include "git-compat-util.h"
#if defined(GIT_WINDOWS_NATIVE)
+#include "lazyload.h"
static int cmd_sync(void)
{
@@ -82,8 +83,7 @@ static int cmd_dropcaches(void)
{
HANDLE hProcess = GetCurrentProcess();
HANDLE hToken;
- HMODULE ntdll;
- DWORD(WINAPI *NtSetSystemInformation)(INT, PVOID, ULONG);
+ DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
SYSTEM_MEMORY_LIST_COMMAND command;
int status;
@@ -95,14 +95,8 @@ static int cmd_dropcaches(void)
CloseHandle(hToken);
- ntdll = LoadLibrary("ntdll.dll");
- if (!ntdll)
- return error("Can't load ntdll.dll, wrong Windows version?");
-
- NtSetSystemInformation =
- (DWORD(WINAPI *)(INT, PVOID, ULONG))GetProcAddress(ntdll, "NtSetSystemInformation");
- if (!NtSetSystemInformation)
- return error("Can't get function addresses, wrong Windows version?");
+ if (!INIT_PROC_ADDR(NtSetSystemInformation))
+ return error("Could not find NtSetSystemInformation() function");
command = MemoryPurgeStandbyList;
status = NtSetSystemInformation(
@@ -115,8 +109,6 @@ static int cmd_dropcaches(void)
else if (status != STATUS_SUCCESS)
error("Unable to execute the memory list command %d", status);
- FreeLibrary(ntdll);
-
return status;
}
base-commit: 1f1cddd558b54bb0ce19c8ace353fd07b758510d
--
2.17.0.windows.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2] test-drop-caches: simplify delay loading of NtSetSystemInformation
2018-05-01 12:46 ` [PATCH v2] " Ben Peart
@ 2018-05-02 6:55 ` Johannes Schindelin
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Schindelin @ 2018-05-02 6:55 UTC (permalink / raw)
To: Ben Peart
Cc: git@vger.kernel.org, gitster@pobox.com, j6t@kdbg.org,
pclouds@gmail.com, sunshine@sunshineco.com, sbeller@google.com
Hi Ben,
On Tue, 1 May 2018, Ben Peart wrote:
> Take advantage of the recent addition of support for lazy loading functions[1]
> on Windows to simplify the loading of NtSetSystemInformation.
>
> [1] db2f7c48cb (Win32: simplify loading of DLL functions, 2017-09-25)
>
> Signed-off-by: Ben Peart <benpeart@microsoft.com>
> ---
Thank you for your diligence. I read over the code, and it is still good,
so you can add an Acked-by: or Reviewed-by: (or Junio can).
Thanks,
Johannes
^ permalink raw reply [flat|nested] 9+ messages in thread