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

MXS-1848 Implement createInstance() and destroyInstance()

Browse Source 
CreateInstance() (renamed from initMonitor()) and destroyInstance()
(renamed from finishMonitor()) have now tentatively been
implemented for all monitors.

Next step is to

1) change the prototype of startMonitor() to

       bool (*startMonitor)(MXS_SPECIFIC_MONITOR*,
                            const MXS_MONITOR_PARAMETER*);

   and assume that mon->handle will always contain the
   instance,
2) not delete any data in stopMonitor(),
3) add monitorCreateAll() that calls createInstance() for all
   monitors (and call that in main()), and
4) add monitorDestroyAll() that calls destroyInstance() for
   all monitors (and call that in main()).
This commit is contained in:
Johan Wikman
2018-05-04 15:06:44 +03:00
parent 02cd7b9275
commit 60228f0f26
12 changed files with 300 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/maxscale/monitor.h
View File

@ -65,10 +65,10 @@ typedef struct mxs_specific_monitor
typedef struct mxs_monitor_object
{
/**
* @brief Initialize the monitor.
* @brief Create the monitor.
*
* This entry point is called once when MaxScale is started, for
* initializing the monitor.
* creating the monitor.
*
* If the function fails, MaxScale will not start. That is, it
* should fail only for fatal reasons such as not being able to
@ -82,11 +82,11 @@ typedef struct mxs_monitor_object
* @return Pointer to the monitor specific data. Will be stored
* in @c monitor->handle.
*/
MXS_SPECIFIC_MONITOR *(*initMonitor)(MXS_MONITOR *monitor,
const MXS_CONFIG_PARAMETER *params);
MXS_SPECIFIC_MONITOR *(*createInstance)(MXS_MONITOR *monitor,
const MXS_CONFIG_PARAMETER *params);
/**
* @brief Finish the monitor.
* @brief Destroy the monitor.
*
* This entry point is called once when MaxScale is shutting down, iff
* the earlier call to @c initMonitor returned on object. The monitor should
@ -94,7 +94,7 @@ typedef struct mxs_monitor_object
*
* @param monitor The monitor object.
*/
void (*finishMonitor)(MXS_SPECIFIC_MONITOR *monitor);
void (*destroyInstance)(MXS_SPECIFIC_MONITOR *monitor);
/**
* @brief Start the monitor