morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

network: split out manager_clean_all() from manager_dirty_handler()

Browse Source 
And rename manager_dirty_handler() to manager_post_handler().

No functional change, just refactoring.
This commit is contained in:
Yu Watanabe
2023-12-21 03:46:03 +09:00
parent b993e7e72e
commit 2e1113b7d0
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/network/networkd-manager.c
View File

@@ -429,24 +429,11 @@ static int manager_connect_rtnl(Manager *m, int fd) {
return manager_setup_rtnl_filter(m);
}
static int manager_dirty_handler(sd_event_source *s, void *userdata) {
Manager *m = ASSERT_PTR(userdata);
Link *link;
int r;
static int manager_post_handler(sd_event_source *s, void *userdata) {
Manager *manager = ASSERT_PTR(userdata);
if (m->dirty) {
r = manager_save(m);
if (r < 0)
log_warning_errno(r, "Failed to update state file %s, ignoring: %m", m->state_file);
}
SET_FOREACH(link, m->dirty_links) {
r = link_save_and_clean(link);
if (r < 0)
log_link_warning_errno(link, r, "Failed to update link state file %s, ignoring: %m", link->state_file);
}
return 1;
(void) manager_clean_all(manager);
return 0;
}
static int signal_terminate_callback(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
@@ -522,7 +509,7 @@ int manager_setup(Manager *m) {
if (r < 0)
log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m");
r = sd_event_add_post(m->event, NULL, manager_dirty_handler, m);
r = sd_event_add_post(m->event, NULL, manager_post_handler, m);
if (r < 0)
return r;

23
src/network/networkd-state-file.c
View File

@@ -861,3 +861,26 @@ int link_save_and_clean_full(Link *link, bool also_save_manager) {
link_clean(link);
return k;
}
int manager_clean_all(Manager *manager) {
int r, ret = 0;
assert(manager);
if (manager->dirty) {
r = manager_save(manager);
if (r < 0)
log_warning_errno(r, "Failed to update state file %s, ignoring: %m", manager->state_file);
RET_GATHER(ret, r);
}
Link *link;
SET_FOREACH(link, manager->dirty_links) {
r = link_save_and_clean(link);
if (r < 0)
log_link_warning_errno(link, r, "Failed to update link state file %s, ignoring: %m", link->state_file);
RET_GATHER(ret, r);
}
return ret;
}

1
src/network/networkd-state-file.h
View File

@@ -12,3 +12,4 @@ static inline int link_save_and_clean(Link *link) {
}
int manager_save(Manager *m);
int manager_clean_all(Manager *manager);