hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1929: Implement filter destruction

Browse Source 
Now that the filters are fully reference counted, their destruction is
trivially simple to implement.
This commit is contained in:
Markus Mäkelä
2018-08-03 15:44:48 +03:00
parent 8cb3a85afd
commit 3a185902b7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/filter.cc
View File

@ -146,6 +146,7 @@ void filter_free(const SFilterDef& filter)
// Removing the filter from the list will trigger deletion once it's no longer in use // Removing the filter from the list will trigger deletion once it's no longer in use
Guard guard(this_unit.lock); Guard guard(this_unit.lock);
auto it = std::remove(this_unit.filters.begin(), this_unit.filters.end(), filter); auto it = std::remove(this_unit.filters.begin(), this_unit.filters.end(), filter);
ss_dassert(it != this_unit.filters.end());
this_unit.filters.erase(it); this_unit.filters.erase(it);
} }
@ -174,7 +175,7 @@ void filter_destroy(const SFilterDef& filter)
{ {
ss_dassert(filter); ss_dassert(filter);
ss_dassert(filter_can_be_destroyed(filter)); ss_dassert(filter_can_be_destroyed(filter));
ss_info_dassert(!true, "Not yet implemented"); filter_free(filter);
} }
void filter_destroy_instances() void filter_destroy_instances()