fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 12:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: improve way to prune dirty route-manager entries

Browse source 
The general idea is that when we have entries tracked by the
route-manager, that we can mark them all as dirty. Then, calling the
"track" function will reset the dirty flag. Finally, there is a method
to delete all dirty entries.

As we can lookup an entry with O(1) (using dictionaries), we can
sync the list of tracked objects with O(n). We just need to track
all the ones we care about, and then delete those that were not touched
(that is, are still dirty).

Previously, we had to explicitly mark all entries as dirty. We can do
better. Just let nmp_route_manager_untrack_all() mark the survivors as
dirty right away. This way, we can save iterating the list once.

It also makes sense because the only purpose of the dirty flag is to
aid this prune mechanism with track/untrack-all. So, untrack-all can
just help out, and leave the remaining entries dirty, so that the next
track does the right thing.

(cherry picked from commit 9e90bb0817)
This commit is contained in:
Thomas Haller 2022-02-08 11:56:17 +01:00
parent 0dab9404a4
commit 5ca61db640
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/devices/nm-device.c
View file

@ -9298,9 +9298,6 @@ _routing_rules_sync(NMDevice *self, NMTernary set_mode)
int is_ipv4;
untrack_only_dirty = TRUE;
nmp_route_manager_set_dirty(route_manager, user_tag_1);
if (klass->get_extra_rules)
nmp_route_manager_set_dirty(route_manager, user_tag_2);
applied_connection = nm_device_get_applied_connection(self);
@ -9347,9 +9344,9 @@ _routing_rules_sync(NMDevice *self, NMTernary set_mode)
}
}
nmp_route_manager_untrack_all(route_manager, user_tag_1, !untrack_only_dirty);
nmp_route_manager_untrack_all(route_manager, user_tag_1, !untrack_only_dirty, TRUE);
if (klass->get_extra_rules)
nmp_route_manager_untrack_all(route_manager, user_tag_2, !untrack_only_dirty);
nmp_route_manager_untrack_all(route_manager, user_tag_2, !untrack_only_dirty, TRUE);
keep_deleted_rules = FALSE;
if (set_mode == NM_TERNARY_DEFAULT) {

6
src/libnm-platform/nmp-route-manager.c
View file

@ -514,7 +514,8 @@ nmp_route_manager_set_dirty(NMPRouteManager *self, gconstpointer user_tag)
gboolean
nmp_route_manager_untrack_all(NMPRouteManager *self,
gconstpointer user_tag,
gboolean all /* or only dirty */)
gboolean all /* or only dirty */,
gboolean make_survivors_dirty)
{
TrackData *track_data;
TrackData *track_data_safe;
@ -535,7 +536,10 @@ nmp_route_manager_untrack_all(NMPRouteManager *self,
if (all || track_data->dirty) {
_track_data_untrack(self, track_data, FALSE, FALSE);
changed = TRUE;
continue;
}
if (make_survivors_dirty)
track_data->dirty = TRUE;
}
if (c_list_is_empty(&user_tag_data->user_tag_lst_head))
g_hash_table_remove(self->by_user_tag, user_tag_data);

3
src/libnm-platform/nmp-route-manager.h
View file

@ -69,7 +69,8 @@ void nmp_route_manager_set_dirty(NMPRouteManager *self, gconstpointer user_tag);
gboolean nmp_route_manager_untrack_all(NMPRouteManager *self,
gconstpointer user_tag,
gboolean all /* or only dirty */);
gboolean all /* or only dirty */,
gboolean make_survivors_dirty);
void nmp_route_manager_sync(NMPRouteManager *self, NMPObjectType obj_type, gboolean keep_deleted);