chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Substitute declaration masks (1/4)
[elogind.git]
/
src
/
core
/
cgroup.c
diff --git
a/src/core/cgroup.c
b/src/core/cgroup.c
index 792f0d9119936402f2a178980c4504b84f5601e2..b18940f824e67a6fbf33fd465130dd03cc40a8a7 100644
(file)
--- a/
src/core/cgroup.c
+++ b/
src/core/cgroup.c
@@
-22,12
+22,18
@@
#include <fcntl.h>
#include <fnmatch.h>
#include <fcntl.h>
#include <fnmatch.h>
+#include "alloc-util.h"
#include "cgroup-util.h"
#include "cgroup-util.h"
+#include "cgroup.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "fs-util.h"
+#include "parse-util.h"
#include "path-util.h"
#include "process-util.h"
//#include "special.h"
#include "path-util.h"
#include "process-util.h"
//#include "special.h"
-
-#include "
cgroup
.h"
+#include "string-table.h"
+#include "
string-util
.h"
#define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC)
#define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC)
@@
-1205,7
+1211,7
@@
int unit_search_main_pid(Unit *u, pid_t *ret) {
continue;
/* Ignore processes that aren't our kids */
continue;
/* Ignore processes that aren't our kids */
- if (get_p
arent_of_
pid(npid, &ppid) >= 0 && ppid != mypid)
+ if (get_p
rocess_p
pid(npid, &ppid) >= 0 && ppid != mypid)
continue;
if (pid != 0)
continue;
if (pid != 0)