chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.freedesktop.org/git/systemd
[elogind.git]
/
src
/
unit.c
diff --git
a/src/unit.c
b/src/unit.c
index 5d51f99966e8deb660cbe28cc3d2324bace7add5..b362fd3b41957385e7e106f2a10bc98e45bc7bce 100644
(file)
--- a/
src/unit.c
+++ b/
src/unit.c
@@
-39,6
+39,7
@@
#include "specifier.h"
#include "dbus-unit.h"
#include "special.h"
#include "specifier.h"
#include "dbus-unit.h"
#include "special.h"
+#include "cgroup-util.h"
const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = &service_vtable,
const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = &service_vtable,
@@
-1144,14
+1145,14
@@
int unit_watch_pid(Unit *u, pid_t pid) {
/* Watch a specific PID. We only support one unit watching
* each PID for now. */
/* Watch a specific PID. We only support one unit watching
* each PID for now. */
- return hashmap_put(u->meta.manager->watch_pids,
UINT32
_TO_PTR(pid), u);
+ return hashmap_put(u->meta.manager->watch_pids,
LONG
_TO_PTR(pid), u);
}
void unit_unwatch_pid(Unit *u, pid_t pid) {
assert(u);
assert(pid >= 1);
}
void unit_unwatch_pid(Unit *u, pid_t pid) {
assert(u);
assert(pid >= 1);
- hashmap_remove_value(u->meta.manager->watch_pids,
UINT32
_TO_PTR(pid), u);
+ hashmap_remove_value(u->meta.manager->watch_pids,
LONG
_TO_PTR(pid), u);
}
int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
}
int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {