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

MXS-1848 Change prototype of startMonitor

Browse Source 
StartMonitor() now takes a MXS_MONITOR_INSTANCE and returns
true, if the monitor could be started and false otherwise.
So, the setup is such that in createInstance(), the instance
data is created and then using startMonitor() and stopMonitor()
the monitor is started/stopped. Finally in destroyInstance(),
the actual instance data is deleted.
This commit is contained in:
Johan Wikman
2018-05-07 11:31:27 +03:00
parent 5c1083c4aa
commit 44fa2a4be2
10 changed files with 208 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/core/monitor.cc
View File

@ -105,10 +105,10 @@ MXS_MONITOR* monitor_create(const char *name, const char *module)
char *my_module = MXS_STRDUP(module);
MXS_MONITOR *mon = (MXS_MONITOR *)MXS_MALLOC(sizeof(MXS_MONITOR));
if (!my_name || !mon || !my_module)
if (!mon || !my_module || !my_name)
{
MXS_FREE(my_name);
MXS_FREE(mon);
MXS_FREE(my_name);
MXS_FREE(my_module);
return NULL;
}
@ -116,8 +116,9 @@ MXS_MONITOR* monitor_create(const char *name, const char *module)
if ((mon->api = (MXS_MONITOR_API*)load_module(module, MODULE_MONITOR)) == NULL)
{
MXS_ERROR("Unable to load monitor module '%s'.", my_name);
MXS_FREE(my_name);
MXS_FREE(mon);
MXS_FREE(my_module);
MXS_FREE(my_name);
return NULL;
}
mon->active = true;
@ -139,6 +140,16 @@ MXS_MONITOR* monitor_create(const char *name, const char *module)
mon->server_pending_changes = false;
memset(mon->journal_hash, 0, sizeof(mon->journal_hash));
spinlock_init(&mon->lock);
if ((mon->instance = mon->api->createInstance(mon)) == NULL)
{
MXS_ERROR("Unable to create monitor instance for '%s', using module '%s'.",
name, module);
MXS_FREE(mon);
MXS_FREE(my_module);
MXS_FREE(my_name);
}
spinlock_acquire(&monLock);
mon->next = allMonitors;
allMonitors = mon;
@ -204,7 +215,7 @@ monitor_start(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params)
remove_server_journal(monitor);
}
if ((monitor->instance = (*monitor->api->startMonitor)(monitor, params)))
if ((*monitor->api->startMonitor)(monitor->instance, params))
{
monitor->state = MONITOR_STATE_RUNNING;
}