mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-19 12:59:21 +08:00
Cygwin: get/setrlimit: implement RLIMIT_AS
Code based on the idea implemented by the oneTBB project, see https://github.com/oneapi-src/oneTBB Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
parent
f885632f4f
commit
1c7384f9d1
@ -565,6 +565,7 @@ struct init_cygheap: public mini_cygheap
|
|||||||
cygheap_user user;
|
cygheap_user user;
|
||||||
user_heap_info user_heap;
|
user_heap_info user_heap;
|
||||||
mode_t umask;
|
mode_t umask;
|
||||||
|
LONG rlim_as_id;
|
||||||
unsigned long rlim_core;
|
unsigned long rlim_core;
|
||||||
HANDLE console_h;
|
HANDLE console_h;
|
||||||
cwdstuff cwd;
|
cwdstuff cwd;
|
||||||
|
@ -1406,19 +1406,21 @@ extern "C"
|
|||||||
ULONG, PTOKEN_PRIVILEGES, PULONG);
|
ULONG, PTOKEN_PRIVILEGES, PULONG);
|
||||||
NTSTATUS NTAPI NtAllocateLocallyUniqueId (PLUID);
|
NTSTATUS NTAPI NtAllocateLocallyUniqueId (PLUID);
|
||||||
NTSTATUS NTAPI NtAllocateUuids (PLARGE_INTEGER, PULONG, PULONG, PUCHAR);
|
NTSTATUS NTAPI NtAllocateUuids (PLARGE_INTEGER, PULONG, PULONG, PUCHAR);
|
||||||
|
NTSTATUS NTAPI NtAssignProcessToJobObject (HANDLE, HANDLE);
|
||||||
NTSTATUS NTAPI NtCancelTimer (HANDLE, PBOOLEAN);
|
NTSTATUS NTAPI NtCancelTimer (HANDLE, PBOOLEAN);
|
||||||
NTSTATUS NTAPI NtClose (HANDLE);
|
NTSTATUS NTAPI NtClose (HANDLE);
|
||||||
NTSTATUS NTAPI NtCommitTransaction (HANDLE, BOOLEAN);
|
NTSTATUS NTAPI NtCommitTransaction (HANDLE, BOOLEAN);
|
||||||
NTSTATUS NTAPI NtContinue (PCONTEXT, BOOLEAN);
|
NTSTATUS NTAPI NtContinue (PCONTEXT, BOOLEAN);
|
||||||
NTSTATUS NTAPI NtCreateDirectoryObject (PHANDLE, ACCESS_MASK,
|
NTSTATUS NTAPI NtCreateDirectoryObject (PHANDLE, ACCESS_MASK,
|
||||||
POBJECT_ATTRIBUTES);
|
POBJECT_ATTRIBUTES);
|
||||||
NTSTATUS NTAPI NtCreateKey (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG,
|
|
||||||
PUNICODE_STRING, ULONG, PULONG);
|
|
||||||
NTSTATUS NTAPI NtCreateEvent (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
|
NTSTATUS NTAPI NtCreateEvent (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
|
||||||
EVENT_TYPE, BOOLEAN);
|
EVENT_TYPE, BOOLEAN);
|
||||||
NTSTATUS NTAPI NtCreateFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
|
NTSTATUS NTAPI NtCreateFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
|
||||||
PIO_STATUS_BLOCK, PLARGE_INTEGER, ULONG, ULONG,
|
PIO_STATUS_BLOCK, PLARGE_INTEGER, ULONG, ULONG,
|
||||||
ULONG, ULONG, PVOID, ULONG);
|
ULONG, ULONG, PVOID, ULONG);
|
||||||
|
NTSTATUS NTAPI NtCreateJobObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
|
||||||
|
NTSTATUS NTAPI NtCreateKey (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG,
|
||||||
|
PUNICODE_STRING, ULONG, PULONG);
|
||||||
NTSTATUS NTAPI NtCreateMailslotFile(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
|
NTSTATUS NTAPI NtCreateMailslotFile(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
|
||||||
PIO_STATUS_BLOCK, ULONG, ULONG, ULONG,
|
PIO_STATUS_BLOCK, ULONG, ULONG, ULONG,
|
||||||
PLARGE_INTEGER);
|
PLARGE_INTEGER);
|
||||||
@ -1478,6 +1480,7 @@ extern "C"
|
|||||||
NTSTATUS NTAPI NtOpenEvent (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
|
NTSTATUS NTAPI NtOpenEvent (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
|
||||||
NTSTATUS NTAPI NtOpenFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
|
NTSTATUS NTAPI NtOpenFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
|
||||||
PIO_STATUS_BLOCK, ULONG, ULONG);
|
PIO_STATUS_BLOCK, ULONG, ULONG);
|
||||||
|
NTSTATUS NTAPI NtOpenJobObject (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
|
||||||
NTSTATUS NTAPI NtOpenKey (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
|
NTSTATUS NTAPI NtOpenKey (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
|
||||||
NTSTATUS NTAPI NtOpenMutant (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
|
NTSTATUS NTAPI NtOpenMutant (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
|
||||||
NTSTATUS NTAPI NtOpenProcessToken (HANDLE, ACCESS_MASK, PHANDLE);
|
NTSTATUS NTAPI NtOpenProcessToken (HANDLE, ACCESS_MASK, PHANDLE);
|
||||||
@ -1505,6 +1508,8 @@ extern "C"
|
|||||||
PFILE_NETWORK_OPEN_INFORMATION);
|
PFILE_NETWORK_OPEN_INFORMATION);
|
||||||
NTSTATUS NTAPI NtQueryInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID,
|
NTSTATUS NTAPI NtQueryInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID,
|
||||||
ULONG, FILE_INFORMATION_CLASS);
|
ULONG, FILE_INFORMATION_CLASS);
|
||||||
|
NTSTATUS NTAPI NtQueryInformationJobObject (HANDLE, JOBOBJECTINFOCLASS,
|
||||||
|
PVOID, ULONG, PULONG);
|
||||||
NTSTATUS NTAPI NtQueryInformationProcess (HANDLE, PROCESSINFOCLASS,
|
NTSTATUS NTAPI NtQueryInformationProcess (HANDLE, PROCESSINFOCLASS,
|
||||||
PVOID, ULONG, PULONG);
|
PVOID, ULONG, PULONG);
|
||||||
NTSTATUS NTAPI NtQueryInformationThread (HANDLE, THREADINFOCLASS, PVOID,
|
NTSTATUS NTAPI NtQueryInformationThread (HANDLE, THREADINFOCLASS, PVOID,
|
||||||
@ -1542,6 +1547,8 @@ extern "C"
|
|||||||
NTSTATUS NTAPI NtSetEvent (HANDLE, PULONG);
|
NTSTATUS NTAPI NtSetEvent (HANDLE, PULONG);
|
||||||
NTSTATUS NTAPI NtSetInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG,
|
NTSTATUS NTAPI NtSetInformationFile (HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG,
|
||||||
FILE_INFORMATION_CLASS);
|
FILE_INFORMATION_CLASS);
|
||||||
|
NTSTATUS NTAPI NtSetInformationJobObject (HANDLE, JOBOBJECTINFOCLASS, PVOID,
|
||||||
|
ULONG);
|
||||||
NTSTATUS NTAPI NtSetInformationThread (HANDLE, THREADINFOCLASS, PVOID, ULONG);
|
NTSTATUS NTAPI NtSetInformationThread (HANDLE, THREADINFOCLASS, PVOID, ULONG);
|
||||||
NTSTATUS NTAPI NtSetInformationToken (HANDLE, TOKEN_INFORMATION_CLASS, PVOID,
|
NTSTATUS NTAPI NtSetInformationToken (HANDLE, TOKEN_INFORMATION_CLASS, PVOID,
|
||||||
ULONG);
|
ULONG);
|
||||||
|
@ -20,6 +20,7 @@ details. */
|
|||||||
#include "pinfo.h"
|
#include "pinfo.h"
|
||||||
#include "dtable.h"
|
#include "dtable.h"
|
||||||
#include "cygheap.h"
|
#include "cygheap.h"
|
||||||
|
#include "shared_info.h"
|
||||||
#include "ntdll.h"
|
#include "ntdll.h"
|
||||||
|
|
||||||
/* add timeval values */
|
/* add timeval values */
|
||||||
@ -162,6 +163,15 @@ get_rlimit_stack (void)
|
|||||||
return (size_t) rl.rlim_cur;
|
return (size_t) rl.rlim_cur;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static LONG job_serial_number __attribute__((section (".cygwin_dll_common"), shared));
|
||||||
|
|
||||||
|
static PWCHAR
|
||||||
|
job_shared_name (PWCHAR buf, LONG num)
|
||||||
|
{
|
||||||
|
__small_swprintf (buf, L"rlimit.%d", num);
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
extern "C" int
|
extern "C" int
|
||||||
getrlimit (int resource, struct rlimit *rlp)
|
getrlimit (int resource, struct rlimit *rlp)
|
||||||
{
|
{
|
||||||
@ -175,7 +185,36 @@ getrlimit (int resource, struct rlimit *rlp)
|
|||||||
case RLIMIT_CPU:
|
case RLIMIT_CPU:
|
||||||
case RLIMIT_FSIZE:
|
case RLIMIT_FSIZE:
|
||||||
case RLIMIT_DATA:
|
case RLIMIT_DATA:
|
||||||
|
break;
|
||||||
case RLIMIT_AS:
|
case RLIMIT_AS:
|
||||||
|
{
|
||||||
|
UNICODE_STRING uname;
|
||||||
|
WCHAR jobname[32];
|
||||||
|
OBJECT_ATTRIBUTES attr;
|
||||||
|
HANDLE job = NULL;
|
||||||
|
NTSTATUS status;
|
||||||
|
JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobinfo;
|
||||||
|
|
||||||
|
if (cygheap->rlim_as_id)
|
||||||
|
{
|
||||||
|
RtlInitUnicodeString (&uname,
|
||||||
|
job_shared_name (jobname,
|
||||||
|
cygheap->rlim_as_id));
|
||||||
|
InitializeObjectAttributes (&attr, &uname, 0,
|
||||||
|
get_session_parent_dir (), NULL);
|
||||||
|
/* May fail, just check NULL job in that case. */
|
||||||
|
NtOpenJobObject (&job, JOB_OBJECT_QUERY, &attr);
|
||||||
|
}
|
||||||
|
status = NtQueryInformationJobObject (job,
|
||||||
|
JobObjectExtendedLimitInformation,
|
||||||
|
&jobinfo, sizeof jobinfo, NULL);
|
||||||
|
if (!NT_SUCCESS (status))
|
||||||
|
break;
|
||||||
|
if (jobinfo.BasicLimitInformation.LimitFlags & JOB_OBJECT_LIMIT_PROCESS_MEMORY)
|
||||||
|
rlp->rlim_cur = rlp->rlim_max = jobinfo.ProcessMemoryLimit;
|
||||||
|
if (job)
|
||||||
|
NtClose (job);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case RLIMIT_STACK:
|
case RLIMIT_STACK:
|
||||||
__get_rlimit_stack (rlp);
|
__get_rlimit_stack (rlp);
|
||||||
@ -222,6 +261,53 @@ setrlimit (int resource, const struct rlimit *rlp)
|
|||||||
|
|
||||||
switch (resource)
|
switch (resource)
|
||||||
{
|
{
|
||||||
|
case RLIMIT_AS:
|
||||||
|
{
|
||||||
|
LONG new_as_id = 0;
|
||||||
|
UNICODE_STRING uname;
|
||||||
|
WCHAR jobname[32];
|
||||||
|
OBJECT_ATTRIBUTES attr;
|
||||||
|
NTSTATUS status = STATUS_SUCCESS;
|
||||||
|
HANDLE job = NULL;
|
||||||
|
JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobinfo = { 0 };
|
||||||
|
|
||||||
|
/* If we already have a limit, we must not change it because that
|
||||||
|
would potentially influence already running child processes.
|
||||||
|
Just try to create another, nested job. On systems prior to
|
||||||
|
Windows 8 / Server 2012 this will fail, but that's ok. */
|
||||||
|
while (new_as_id == 0)
|
||||||
|
new_as_id = InterlockedIncrement (&job_serial_number);
|
||||||
|
RtlInitUnicodeString (&uname,
|
||||||
|
job_shared_name (jobname, new_as_id));
|
||||||
|
InitializeObjectAttributes (&attr, &uname, 0,
|
||||||
|
get_session_parent_dir (), NULL);
|
||||||
|
status = NtCreateJobObject (&job, JOB_OBJECT_ALL_ACCESS, &attr);
|
||||||
|
if (!NT_SUCCESS (status))
|
||||||
|
{
|
||||||
|
__seterrno_from_nt_status (status);
|
||||||
|
__leave;
|
||||||
|
}
|
||||||
|
status = NtAssignProcessToJobObject (job, NtCurrentProcess ());
|
||||||
|
if (NT_SUCCESS (status))
|
||||||
|
{
|
||||||
|
jobinfo.BasicLimitInformation.LimitFlags
|
||||||
|
= JOB_OBJECT_LIMIT_PROCESS_MEMORY;
|
||||||
|
/* Per Linux man page, round down to system pagesize. */
|
||||||
|
jobinfo.ProcessMemoryLimit
|
||||||
|
= rounddown (rlp->rlim_cur, wincap.allocation_granularity ());
|
||||||
|
status = NtSetInformationJobObject (job,
|
||||||
|
JobObjectExtendedLimitInformation,
|
||||||
|
&jobinfo, sizeof jobinfo);
|
||||||
|
}
|
||||||
|
NtClose (job);
|
||||||
|
if (!NT_SUCCESS (status))
|
||||||
|
{
|
||||||
|
__seterrno_from_nt_status (status);
|
||||||
|
__leave;
|
||||||
|
}
|
||||||
|
cygheap->rlim_as_id = new_as_id;
|
||||||
|
}
|
||||||
|
break;
|
||||||
case RLIMIT_CORE:
|
case RLIMIT_CORE:
|
||||||
cygheap->rlim_core = rlp->rlim_cur;
|
cygheap->rlim_core = rlp->rlim_cur;
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user