system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: merge two post event sources

Browse source 
No functional change, just refactoring.
This commit is contained in:
Yu Watanabe 2023-12-21 03:46:10 +09:00
parent 2e1113b7d0
commit e36d8e4858
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/network/networkd-manager.c
View file

@ -432,6 +432,7 @@ static int manager_connect_rtnl(Manager *m, int fd) {
static int manager_post_handler(sd_event_source *s, void *userdata) {
Manager *manager = ASSERT_PTR(userdata);
(void) manager_process_requests(manager);
(void) manager_clean_all(manager);
return 0;
}
@ -513,10 +514,6 @@ int manager_setup(Manager *m) {
if (r < 0)
return r;
r = sd_event_add_post(m->event, NULL, manager_process_requests, m);
if (r < 0)
return r;
r = manager_listen_fds(m, &rtnl_fd);
if (r < 0)
return r;

5
src/network/networkd-queue.c
View file

@ -210,10 +210,11 @@ int link_queue_request_full(
process, counter, netlink_handler, ret);
}
int manager_process_requests(sd_event_source *s, void *userdata) {
Manager *manager = ASSERT_PTR(userdata);
int manager_process_requests(Manager *manager) {
int r;
assert(manager);
for (;;) {
bool processed = false;
Request *req;

3
src/network/networkd-queue.h
View file

@ -1,7 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
#include "sd-netlink.h"
#include "alloc-util.h"
@ -136,7 +135,7 @@ static inline int link_queue_request(
ret); \
})
int manager_process_requests(sd_event_source *s, void *userdata);
int manager_process_requests(Manager *manager);
int request_call_netlink_async(sd_netlink *nl, sd_netlink_message *m, Request *req);
const char* request_type_to_string(RequestType t) _const_;