dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 14:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: introduce unit_unwatch_pidref_done() helper function

Browse Source 
No functional change, just refactoring.
This commit is contained in:
Yu Watanabe
2024-01-24 16:11:28 +09:00
parent ec5e2a1393
commit ea1e0bf10b
6 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/mount.c
View File

@@ -218,12 +218,7 @@ static int mount_arm_timer(Mount *m, bool relative, usec_t usec) {
static void mount_unwatch_control_pid(Mount *m) {
assert(m);
if (!pidref_is_set(&m->control_pid))
return;
unit_unwatch_pidref(UNIT(m), &m->control_pid);
pidref_done(&m->control_pid);
unit_unwatch_pidref_done(UNIT(m), &m->control_pid);
}
static void mount_parameters_done(MountParameters *p) {

14
src/core/service.c
View File

@@ -152,22 +152,12 @@ static void service_init(Unit *u) {
static void service_unwatch_control_pid(Service *s) {
assert(s);
if (!pidref_is_set(&s->control_pid))
return;
unit_unwatch_pidref(UNIT(s), &s->control_pid);
pidref_done(&s->control_pid);
unit_unwatch_pidref_done(UNIT(s), &s->control_pid);
}
static void service_unwatch_main_pid(Service *s) {
assert(s);
if (!pidref_is_set(&s->main_pid))
return;
unit_unwatch_pidref(UNIT(s), &s->main_pid);
pidref_done(&s->main_pid);
unit_unwatch_pidref_done(UNIT(s), &s->main_pid);
}
static void service_unwatch_pid_file(Service *s) {

7
src/core/socket.c
View File

@@ -108,12 +108,7 @@ static void socket_init(Unit *u) {
static void socket_unwatch_control_pid(Socket *s) {
assert(s);
if (!pidref_is_set(&s->control_pid))
return;
unit_unwatch_pidref(UNIT(s), &s->control_pid);
pidref_done(&s->control_pid);
unit_unwatch_pidref_done(UNIT(s), &s->control_pid);
}
static void socket_cleanup_fd_list(SocketPort *p) {

7
src/core/swap.c
View File

@@ -152,12 +152,7 @@ static void swap_init(Unit *u) {
static void swap_unwatch_control_pid(Swap *s) {
assert(s);
if (!pidref_is_set(&s->control_pid))
return;
unit_unwatch_pidref(UNIT(s), &s->control_pid);
pidref_done(&s->control_pid);
unit_unwatch_pidref_done(UNIT(s), &s->control_pid);
}
static void swap_done(Unit *u) {

10
src/core/unit.c
View File

@@ -2934,6 +2934,16 @@ void unit_unwatch_all_pids(Unit *u) {
u->pids = set_free(u->pids);
}
void unit_unwatch_pidref_done(Unit *u, PidRef *pidref) {
assert(u);
if (!pidref_is_set(pidref))
return;
unit_unwatch_pidref(u, pidref);
pidref_done(pidref);
}
static void unit_tidy_watch_pids(Unit *u) {
PidRef *except1, *except2, *e;

1
src/core/unit.h
View File

@@ -936,6 +936,7 @@ int unit_watch_pid(Unit *u, pid_t pid, bool exclusive);
void unit_unwatch_pidref(Unit *u, const PidRef *pid);
void unit_unwatch_pid(Unit *u, pid_t pid);
void unit_unwatch_all_pids(Unit *u);
void unit_unwatch_pidref_done(Unit *u, PidRef *pidref);
int unit_enqueue_rewatch_pids(Unit *u);
void unit_dequeue_rewatch_pids(Unit *u);