External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

process: Allow virProcessPrLimit() to get current limit

Browse Source 
The prlimit() function allows both getting and setting limits for
a process; expose the same functionality in our wrapper.

Add the const modifier for new_limit, in accordance with the
prototype for prlimit().
This commit is contained in:
Andrea Bolognani 2015-11-20 17:21:11 +01:00
parent df2fadfc6e
commit c2f797544f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/virprocess.c
View File

@ -725,15 +725,19 @@ int virProcessSetNamespaces(size_t nfdlist,
#if HAVE_PRLIMIT #if HAVE_PRLIMIT
static int static int
virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim) virProcessPrLimit(pid_t pid,
int resource,
const struct rlimit *new_limit,
struct rlimit *old_limit)
{ {
return prlimit(pid, resource, rlim, NULL); return prlimit(pid, resource, new_limit, old_limit);
} }
#elif HAVE_SETRLIMIT #elif HAVE_SETRLIMIT
static int static int
virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED,
int resource ATTRIBUTE_UNUSED, int resource ATTRIBUTE_UNUSED,
struct rlimit *rlim ATTRIBUTE_UNUSED) const struct rlimit *new_limit ATTRIBUTE_UNUSED,
struct rlimit *old_limit ATTRIBUTE_UNUSED)
{ {
errno = ENOSYS; errno = ENOSYS;
return -1; return -1;
@ -758,7 +762,7 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes)
return -1; return -1;
} }
} else { } else {
if (virProcessPrLimit(pid, RLIMIT_MEMLOCK, &rlim) < 0) { if (virProcessPrLimit(pid, RLIMIT_MEMLOCK, &rlim, NULL) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot limit locked memory " _("cannot limit locked memory "
"of process %lld to %llu"), "of process %lld to %llu"),
@ -803,7 +807,7 @@ virProcessSetMaxProcesses(pid_t pid, unsigned int procs)
return -1; return -1;
} }
} else { } else {
if (virProcessPrLimit(pid, RLIMIT_NPROC, &rlim) < 0) { if (virProcessPrLimit(pid, RLIMIT_NPROC, &rlim, NULL) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot limit number of subprocesses " _("cannot limit number of subprocesses "
"of process %lld to %u"), "of process %lld to %u"),
@ -851,7 +855,7 @@ virProcessSetMaxFiles(pid_t pid, unsigned int files)
return -1; return -1;
} }
} else { } else {
if (virProcessPrLimit(pid, RLIMIT_NOFILE, &rlim) < 0) { if (virProcessPrLimit(pid, RLIMIT_NOFILE, &rlim, NULL) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot limit number of open files " _("cannot limit number of open files "
"of process %lld to %u"), "of process %lld to %u"),