Commit 3aa0a7ecdf3f88d0d37e20c88bf57b69355573fe | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2023-03-24 07:16:49+01:00
committer	GitHub <noreply@github.com> 2023-03-24 07:16:49+01:00
log	3aa0a7ecdf3f88d0d37e20c88bf57b69355573fe
tree	42324dba8b76601f7d30a5270b28fa7763873bbc
parent	dcdb878360045ec50fc0cc6fda0f970150567182
parent	8f4548dd69de3a1c1f5c14cdf6b2e7052ea5079f
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #15035 from xEgoist/windowsMaxRss

Implement getMaxRss for Windows

3 files changed, 108 insertions(+), 0 deletions(-)

lib
- std
  - child_process.zig
  - os
    windows.zig
    windows
    ntdll.zig

lib/std/child_process.zig+13

...	...	@@ -99,12 +99,20 @@ pub const ChildProcess = struct {
99	99	return null;
100	100	}
101	101	},
	102	.windows => {
	103	if (rus.rusage) \|ru\| {
	104	return ru.PeakWorkingSetSize;
	105	} else {
	106	return null;
	107	}
	108	},
102	109	else => return null,
103	110	}
104	111	}
105	112
106	113	const rusage_init = switch (builtin.os.tag) {
107	114	.linux => @as(?std.os.rusage, null),
	115	.windows => @as(?windows.VM_COUNTERS, null),
108	116	else => {},
109	117	};
110	118	};
...	...	@@ -129,6 +137,7 @@ pub const ChildProcess = struct {
129	137	os.SetIdError \|\|
130	138	os.ChangeCurDirError \|\|
131	139	windows.CreateProcessError \|\|
	140	windows.GetProcessMemoryInfoError \|\|
132	141	windows.WaitForSingleObjectError;
133	142
134	143	pub const Term = union(enum) {
...	...	@@ -364,6 +373,10 @@ pub const ChildProcess = struct {
364	373	}
365	374	});
366	375
	376	if (self.request_resource_usage_statistics) {
	377	self.resource_usage_statistics.rusage = try windows.GetProcessMemoryInfo(self.id);
	378	}
	379
367	380	os.close(self.id);
368	381	os.close(self.thread_handle);
369	382	self.cleanupStreams();

lib/std/os/windows.zig+32

...	...	@@ -3947,6 +3947,20 @@ pub const PSAPI_WS_WATCH_INFORMATION = extern struct {
3947	3947	FaultingVa: LPVOID,
3948	3948	};
3949	3949
	3950	pub const VM_COUNTERS = extern struct {
	3951	PeakVirtualSize: SIZE_T,
	3952	VirtualSize: SIZE_T,
	3953	PageFaultCount: ULONG,
	3954	PeakWorkingSetSize: SIZE_T,
	3955	WorkingSetSize: SIZE_T,
	3956	QuotaPeakPagedPoolUsage: SIZE_T,
	3957	QuotaPagedPoolUsage: SIZE_T,
	3958	QuotaPeakNonPagedPoolUsage: SIZE_T,
	3959	QuotaNonPagedPoolUsage: SIZE_T,
	3960	PagefileUsage: SIZE_T,
	3961	PeakPagefileUsage: SIZE_T,
	3962	};
	3963
3950	3964	pub const PROCESS_MEMORY_COUNTERS = extern struct {
3951	3965	cb: DWORD,
3952	3966	PageFaultCount: DWORD,
...	...	@@ -3974,6 +3988,24 @@ pub const PROCESS_MEMORY_COUNTERS_EX = extern struct {
3974	3988	PrivateUsage: SIZE_T,
3975	3989	};
3976	3990
	3991	pub const GetProcessMemoryInfoError = error{
	3992	AccessDenied,
	3993	InvalidHandle,
	3994	Unexpected,
	3995	};
	3996
	3997	pub fn GetProcessMemoryInfo(hProcess: HANDLE) GetProcessMemoryInfoError!VM_COUNTERS {
	3998	var vmc: VM_COUNTERS = undefined;
	3999	const rc = ntdll.NtQueryInformationProcess(hProcess, .ProcessVmCounters, &vmc, @sizeOf(VM_COUNTERS), null);
	4000	switch (rc) {
	4001	.SUCCESS => return vmc,
	4002	.ACCESS_DENIED => return error.AccessDenied,
	4003	.INVALID_HANDLE => return error.InvalidHandle,
	4004	.INVALID_PARAMETER => unreachable,
	4005	else => return unexpectedStatus(rc),
	4006	}
	4007	}
	4008
3977	4009	pub const PERFORMANCE_INFORMATION = extern struct {
3978	4010	cb: DWORD,
3979	4011	CommitTotal: SIZE_T,

lib/std/os/windows/ntdll.zig+63

...	...	@@ -32,6 +32,69 @@ const RUNTIME_FUNCTION = windows.RUNTIME_FUNCTION;
32	32	const KNONVOLATILE_CONTEXT_POINTERS = windows.KNONVOLATILE_CONTEXT_POINTERS;
33	33	const EXCEPTION_ROUTINE = windows.EXCEPTION_ROUTINE;
34	34
	35	pub const PROCESSINFOCLASS = enum(c_int) {
	36	ProcessBasicInformation,
	37	ProcessQuotaLimits,
	38	ProcessIoCounters,
	39	ProcessVmCounters,
	40	ProcessTimes,
	41	ProcessBasePriority,
	42	ProcessRaisePriority,
	43	ProcessDebugPort,
	44	ProcessExceptionPort,
	45	ProcessAccessToken,
	46	ProcessLdtInformation,
	47	ProcessLdtSize,
	48	ProcessDefaultHardErrorMode,
	49	ProcessIoPortHandlers,
	50	ProcessPooledUsageAndLimits,
	51	ProcessWorkingSetWatch,
	52	ProcessUserModeIOPL,
	53	ProcessEnableAlignmentFaultFixup,
	54	ProcessPriorityClass,
	55	ProcessWx86Information,
	56	ProcessHandleCount,
	57	ProcessAffinityMask,
	58	ProcessPriorityBoost,
	59	ProcessDeviceMap,
	60	ProcessSessionInformation,
	61	ProcessForegroundInformation,
	62	ProcessWow64Information,
	63	ProcessImageFileName,
	64	ProcessLUIDDeviceMapsEnabled,
	65	ProcessBreakOnTermination,
	66	ProcessDebugObjectHandle,
	67	ProcessDebugFlags,
	68	ProcessHandleTracing,
	69	ProcessIoPriority,
	70	ProcessExecuteFlags,
	71	ProcessTlsInformation,
	72	ProcessCookie,
	73	ProcessImageInformation,
	74	ProcessCycleTime,
	75	ProcessPagePriority,
	76	ProcessInstrumentationCallback,
	77	ProcessThreadStackAllocation,
	78	ProcessWorkingSetWatchEx,
	79	ProcessImageFileNameWin32,
	80	ProcessImageFileMapping,
	81	ProcessAffinityUpdateMode,
	82	ProcessMemoryAllocationMode,
	83	ProcessGroupInformation,
	84	ProcessTokenVirtualizationEnabled,
	85	ProcessConsoleHostProcess,
	86	ProcessWindowInformation,
	87	MaxProcessInfoClass,
	88	};
	89
	90	pub extern "ntdll" fn NtQueryInformationProcess(
	91	ProcessHandle: HANDLE,
	92	ProcessInformationClass: PROCESSINFOCLASS,
	93	ProcessInformation: *anyopaque,
	94	ProcessInformationLength: ULONG,
	95	ReturnLength: ?*ULONG,
	96	) callconv(WINAPI) NTSTATUS;
	97
35	98	pub const THREADINFOCLASS = enum(c_int) {
36	99	ThreadBasicInformation,
37	100	ThreadTimes,