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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman
2018-03-16 12:54:09 +02:00
parent 6afd57122d 391ec78a0b
commit 3af469a074
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/core/service.cc
View File

@ -26,6 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <math.h> #include <math.h>
#include <fcntl.h> #include <fcntl.h>
#include <map>
#include <string> #include <string>
#include <set> #include <set>
#include <vector> #include <vector>
@ -1960,12 +1961,13 @@ static SERV_LISTENER* service_destroy_listener(SERV_LISTENER* sl)
return next; return next;
} }
typedef std::map<MXS_FILTER*, void(*)(MXS_FILTER*)> DestructorsByFilter;
/** /**
* Destroy one service instance * Destroy one service instance
* *
* @param svc The service to destroy. * @param svc The service to destroy.
*/ */
static void service_destroy_instance(SERVICE* svc) static void service_destroy_instance(SERVICE* svc, DestructorsByFilter* filters_to_delete)
{ {
SERV_LISTENER* sl = svc->ports; SERV_LISTENER* sl = svc->ports;
@ -1986,8 +1988,12 @@ static void service_destroy_instance(SERVICE* svc)
{ {
if (filters[i]->obj->destroyInstance && filters[i]->filter) if (filters[i]->obj->destroyInstance && filters[i]->filter)
{ {
/* Call destroyInstance hook for filters */ if (filters_to_delete->find(filters[i]->filter) == filters_to_delete->end())
filters[i]->obj->destroyInstance(filters[i]->filter); {
auto entry = std::make_pair(filters[i]->filter, filters[i]->obj->destroyInstance);
filters_to_delete->insert(entry);
}
} }
} }
} }
@ -1996,14 +2002,21 @@ static void service_destroy_instance(SERVICE* svc)
void service_destroy_instances(void) void service_destroy_instances(void)
{ {
spinlock_acquire(&service_spin); spinlock_acquire(&service_spin);
DestructorsByFilter filters_to_delete;
SERVICE* svc = allServices; SERVICE* svc = allServices;
while (svc != NULL) while (svc != NULL)
{ {
ss_dassert(svc->svc_do_shutdown); ss_dassert(svc->svc_do_shutdown);
service_destroy_instance(svc); service_destroy_instance(svc, &filters_to_delete);
svc = svc->next; svc = svc->next;
} }
for (auto i = filters_to_delete.begin(); i != filters_to_delete.end(); ++i)
{
i->second(i->first);
}
spinlock_release(&service_spin); spinlock_release(&service_spin);
} }