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

MXS-1848 Change monitorCamelCase to monitor_snake_case

Browse Source
This commit is contained in:
Johan Wikman
2018-05-05 16:21:50 +03:00
parent 83f3d6d71d
commit 510eb7ec7c
10 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/core/config.cc
View File

@ -3503,7 +3503,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
if (mod) if (mod)
{ {
config_add_defaults(obj, mod->parameters); config_add_defaults(obj, mod->parameters);
monitorAddParameters(monitor, obj->parameters); monitor_add_parameters(monitor, obj->parameters);
} }
else else
{ {
@ -3519,7 +3519,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
Perhaps a greater minimum value should be added? */ Perhaps a greater minimum value should be added? */
if (*endptr == '\0' && interval > 0) if (*endptr == '\0' && interval > 0)
{ {
monitorSetInterval(monitor, (unsigned long)interval); monitor_set_interval(monitor, (unsigned long)interval);
} }
else else
{ {
@ -3543,7 +3543,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
if (*endptr == '\0' && interval > 0) if (*endptr == '\0' && interval > 0)
{ {
monitorSetJournalMaxAge(monitor, (time_t)interval); monitor_set_journal_max_age(monitor, (time_t)interval);
} }
else else
{ {
@ -3567,7 +3567,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
if (*endptr == '\0' && interval > 0) if (*endptr == '\0' && interval > 0)
{ {
monitorSetScriptTimeout(monitor, (uint32_t)interval); monitor_set_script_timeout(monitor, (uint32_t)interval);
} }
else else
{ {
@ -3586,7 +3586,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
char *connect_timeout = config_get_value(obj->parameters, CN_BACKEND_CONNECT_TIMEOUT); char *connect_timeout = config_get_value(obj->parameters, CN_BACKEND_CONNECT_TIMEOUT);
if (connect_timeout) if (connect_timeout)
{ {
if (!monitorSetNetworkTimeout(monitor, MONITOR_CONNECT_TIMEOUT, if (!monitor_set_network_timeout(monitor, MONITOR_CONNECT_TIMEOUT,
atoi(connect_timeout), CN_BACKEND_CONNECT_TIMEOUT)) atoi(connect_timeout), CN_BACKEND_CONNECT_TIMEOUT))
{ {
MXS_ERROR("Failed to set '%s'", CN_BACKEND_CONNECT_TIMEOUT); MXS_ERROR("Failed to set '%s'", CN_BACKEND_CONNECT_TIMEOUT);
@ -3597,7 +3597,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
char *read_timeout = config_get_value(obj->parameters, CN_BACKEND_READ_TIMEOUT); char *read_timeout = config_get_value(obj->parameters, CN_BACKEND_READ_TIMEOUT);
if (read_timeout) if (read_timeout)
{ {
if (!monitorSetNetworkTimeout(monitor, MONITOR_READ_TIMEOUT, if (!monitor_set_network_timeout(monitor, MONITOR_READ_TIMEOUT,
atoi(read_timeout), CN_BACKEND_READ_TIMEOUT)) atoi(read_timeout), CN_BACKEND_READ_TIMEOUT))
{ {
MXS_ERROR("Failed to set '%s'", CN_BACKEND_READ_TIMEOUT); MXS_ERROR("Failed to set '%s'", CN_BACKEND_READ_TIMEOUT);
@ -3608,7 +3608,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
char *write_timeout = config_get_value(obj->parameters, CN_BACKEND_WRITE_TIMEOUT); char *write_timeout = config_get_value(obj->parameters, CN_BACKEND_WRITE_TIMEOUT);
if (write_timeout) if (write_timeout)
{ {
if (!monitorSetNetworkTimeout(monitor, MONITOR_WRITE_TIMEOUT, if (!monitor_set_network_timeout(monitor, MONITOR_WRITE_TIMEOUT,
atoi(write_timeout), CN_BACKEND_WRITE_TIMEOUT)) atoi(write_timeout), CN_BACKEND_WRITE_TIMEOUT))
{ {
MXS_ERROR("Failed to set '%s'", CN_BACKEND_WRITE_TIMEOUT); MXS_ERROR("Failed to set '%s'", CN_BACKEND_WRITE_TIMEOUT);
@ -3619,7 +3619,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
char *connect_attempts = config_get_value(obj->parameters, CN_BACKEND_CONNECT_ATTEMPTS); char *connect_attempts = config_get_value(obj->parameters, CN_BACKEND_CONNECT_ATTEMPTS);
if (connect_attempts) if (connect_attempts)
{ {
if (!monitorSetNetworkTimeout(monitor, MONITOR_CONNECT_ATTEMPTS, if (!monitor_set_network_timeout(monitor, MONITOR_CONNECT_ATTEMPTS,
atoi(connect_attempts), CN_BACKEND_CONNECT_ATTEMPTS)) atoi(connect_attempts), CN_BACKEND_CONNECT_ATTEMPTS))
{ {
MXS_ERROR("Failed to set '%s'", CN_BACKEND_CONNECT_ATTEMPTS); MXS_ERROR("Failed to set '%s'", CN_BACKEND_CONNECT_ATTEMPTS);
@ -3647,7 +3647,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
"This will cause undefined behavior.", "This will cause undefined behavior.",
obj1->object); obj1->object);
} }
monitorAddServer(monitor, (SERVER*)obj1->element); monitor_add_server(monitor, (SERVER*)obj1->element);
} }
obj1 = obj1->next; obj1 = obj1->next;
} }
@ -3666,7 +3666,7 @@ int create_new_monitor(CONFIG_CONTEXT *context, CONFIG_CONTEXT *obj, HASHTABLE*
char *passwd = config_get_password(obj->parameters); char *passwd = config_get_password(obj->parameters);
if (user && passwd) if (user && passwd)
{ {
monitorAddUser(monitor, user, passwd); monitor_add_user(monitor, user, passwd);
} }
else if (user) else if (user)
{ {

40
server/core/config_runtime.cc
View File

@ -84,7 +84,7 @@ bool runtime_link_server(SERVER *server, const char *target)
} }
else if (monitor) else if (monitor)
{ {
if (monitorAddServer(monitor, server)) if (monitor_add_server(monitor, server))
{ {
monitor_serialize(monitor); monitor_serialize(monitor);
rval = true; rval = true;
@ -124,7 +124,7 @@ bool runtime_unlink_server(SERVER *server, const char *target)
} }
else if (monitor) else if (monitor)
{ {
monitorRemoveServer(monitor, server); monitor_remove_server(monitor, server);
monitor_serialize(monitor); monitor_serialize(monitor);
} }
@ -434,7 +434,7 @@ static void add_monitor_defaults(MXS_MONITOR *monitor)
if (mod) if (mod)
{ {
config_add_defaults(&ctx, mod->parameters); config_add_defaults(&ctx, mod->parameters);
monitorAddParameters(monitor, ctx.parameters); monitor_add_parameters(monitor, ctx.parameters);
config_parameter_free(ctx.parameters); config_parameter_free(ctx.parameters);
} }
else else
@ -453,12 +453,12 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
if (strcmp(key, CN_USER) == 0) if (strcmp(key, CN_USER) == 0)
{ {
valid = true; valid = true;
monitorAddUser(monitor, value, monitor->password); monitor_add_user(monitor, value, monitor->password);
} }
else if (strcmp(key, CN_PASSWORD) == 0) else if (strcmp(key, CN_PASSWORD) == 0)
{ {
valid = true; valid = true;
monitorAddUser(monitor, monitor->user, value); monitor_add_user(monitor, monitor->user, value);
} }
else if (strcmp(key, CN_MONITOR_INTERVAL) == 0) else if (strcmp(key, CN_MONITOR_INTERVAL) == 0)
{ {
@ -466,7 +466,7 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
if (ival) if (ival)
{ {
valid = true; valid = true;
monitorSetInterval(monitor, ival); monitor_set_interval(monitor, ival);
} }
} }
else if (strcmp(key, CN_BACKEND_CONNECT_TIMEOUT) == 0) else if (strcmp(key, CN_BACKEND_CONNECT_TIMEOUT) == 0)
@ -475,7 +475,7 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
if (ival) if (ival)
{ {
valid = true; valid = true;
monitorSetNetworkTimeout(monitor, MONITOR_CONNECT_TIMEOUT, ival, CN_BACKEND_CONNECT_TIMEOUT); monitor_set_network_timeout(monitor, MONITOR_CONNECT_TIMEOUT, ival, CN_BACKEND_CONNECT_TIMEOUT);
} }
} }
else if (strcmp(key, CN_BACKEND_WRITE_TIMEOUT) == 0) else if (strcmp(key, CN_BACKEND_WRITE_TIMEOUT) == 0)
@ -484,7 +484,7 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
if (ival) if (ival)
{ {
valid = true; valid = true;
monitorSetNetworkTimeout(monitor, MONITOR_WRITE_TIMEOUT, ival, CN_BACKEND_WRITE_TIMEOUT); monitor_set_network_timeout(monitor, MONITOR_WRITE_TIMEOUT, ival, CN_BACKEND_WRITE_TIMEOUT);
} }
} }
else if (strcmp(key, CN_BACKEND_READ_TIMEOUT) == 0) else if (strcmp(key, CN_BACKEND_READ_TIMEOUT) == 0)
@ -493,7 +493,7 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
if (ival) if (ival)
{ {
valid = true; valid = true;
monitorSetNetworkTimeout(monitor, MONITOR_READ_TIMEOUT, ival, CN_BACKEND_READ_TIMEOUT); monitor_set_network_timeout(monitor, MONITOR_READ_TIMEOUT, ival, CN_BACKEND_READ_TIMEOUT);
} }
} }
else if (strcmp(key, CN_BACKEND_CONNECT_ATTEMPTS) == 0) else if (strcmp(key, CN_BACKEND_CONNECT_ATTEMPTS) == 0)
@ -502,7 +502,7 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
if (ival) if (ival)
{ {
valid = true; valid = true;
monitorSetNetworkTimeout(monitor, MONITOR_CONNECT_ATTEMPTS, ival, CN_BACKEND_CONNECT_ATTEMPTS); monitor_set_network_timeout(monitor, MONITOR_CONNECT_ATTEMPTS, ival, CN_BACKEND_CONNECT_ATTEMPTS);
} }
} }
else if (strcmp(key, CN_JOURNAL_MAX_AGE) == 0) else if (strcmp(key, CN_JOURNAL_MAX_AGE) == 0)
@ -511,7 +511,7 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
if (ival) if (ival)
{ {
valid = true; valid = true;
monitorSetJournalMaxAge(monitor, ival); monitor_set_journal_max_age(monitor, ival);
} }
} }
else if (strcmp(key, CN_SCRIPT_TIMEOUT) == 0) else if (strcmp(key, CN_SCRIPT_TIMEOUT) == 0)
@ -520,15 +520,15 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
if (ival) if (ival)
{ {
valid = true; valid = true;
monitorSetScriptTimeout(monitor, ival); monitor_set_script_timeout(monitor, ival);
} }
} }
else if (config_param_is_valid(mod->parameters, key, value, NULL)) else if (config_param_is_valid(mod->parameters, key, value, NULL))
{ {
/** We're modifying module specific parameters and we need to stop the monitor */ /** We're modifying module specific parameters and we need to stop the monitor */
monitorStop(monitor); monitor_stop(monitor);
if (monitorRemoveParameter(monitor, key) || value[0]) if (monitor_remove_parameter(monitor, key) || value[0])
{ {
/** Either we're removing an existing parameter or adding a new one */ /** Either we're removing an existing parameter or adding a new one */
valid = true; valid = true;
@ -538,11 +538,11 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
MXS_CONFIG_PARAMETER p = {}; MXS_CONFIG_PARAMETER p = {};
p.name = const_cast<char*>(key); p.name = const_cast<char*>(key);
p.value = const_cast<char*>(value); p.value = const_cast<char*>(value);
monitorAddParameters(monitor, &p); monitor_add_parameters(monitor, &p);
} }
} }
monitorStart(monitor, monitor->parameters); monitor_start(monitor, monitor->parameters);
} }
if (valid) if (valid)
@ -986,11 +986,11 @@ bool runtime_destroy_monitor(MXS_MONITOR *monitor)
if (rval) if (rval)
{ {
monitorStop(monitor); monitor_stop(monitor);
while (monitor->monitored_servers) while (monitor->monitored_servers)
{ {
monitorRemoveServer(monitor, monitor->monitored_servers->server); monitor_remove_server(monitor, monitor->monitored_servers->server);
} }
monitor_deactivate(monitor); monitor_deactivate(monitor);
MXS_NOTICE("Destroyed monitor '%s'", monitor->name); MXS_NOTICE("Destroyed monitor '%s'", monitor->name);
@ -1679,8 +1679,8 @@ bool runtime_alter_monitor_from_json(MXS_MONITOR* monitor, json_t* new_json)
if (changed) if (changed)
{ {
/** A configuration change was made, restart the monitor */ /** A configuration change was made, restart the monitor */
monitorStop(monitor); monitor_stop(monitor);
monitorStart(monitor, monitor->parameters); monitor_start(monitor, monitor->parameters);
} }
} }

6
server/core/gateway.cc
View File

@ -2152,7 +2152,7 @@ int main(int argc, char **argv)
} }
/** Start all monitors */ /** Start all monitors */
monitorStartAll(); monitor_start_all();
/** Start the services that were created above */ /** Start the services that were created above */
n_services = service_launch_all(); n_services = service_launch_all();
@ -2241,13 +2241,13 @@ int main(int argc, char **argv)
worker->run(); worker->run();
/*< Stop all the monitors */ /*< Stop all the monitors */
monitorStopAll(); monitor_stop_all();
/** Stop administrative interface */ /** Stop administrative interface */
mxs_admin_shutdown(); mxs_admin_shutdown();
/*< Stop all the monitors */ /*< Stop all the monitors */
monitorStopAll(); monitor_stop_all();
/*< /*<
* Wait for the housekeeper to finish. * Wait for the housekeeper to finish.

34
server/core/internal/monitor.h
View File

@ -50,8 +50,8 @@ typedef enum
MXS_MONITOR *monitor_alloc(const char *, const char *); MXS_MONITOR *monitor_alloc(const char *, const char *);
void monitor_free(MXS_MONITOR *); void monitor_free(MXS_MONITOR *);
void monitorStart(MXS_MONITOR *, const MXS_CONFIG_PARAMETER*); void monitor_start(MXS_MONITOR *, const MXS_CONFIG_PARAMETER*);
void monitorStop(MXS_MONITOR *); void monitor_stop(MXS_MONITOR *);
/** /**
* @brief Mark monitor as deactivated * @brief Mark monitor as deactivated
@ -63,28 +63,28 @@ void monitorStop(MXS_MONITOR *);
*/ */
void monitor_deactivate(MXS_MONITOR* monitor); void monitor_deactivate(MXS_MONITOR* monitor);
void monitorStopAll(); void monitor_stop_all();
void monitorStartAll(); void monitor_start_all();
MXS_MONITOR *monitor_find(const char *); MXS_MONITOR *monitor_find(const char *);
MXS_MONITOR* monitor_repurpose_destroyed(const char* name, const char* module); MXS_MONITOR* monitor_repurpose_destroyed(const char* name, const char* module);
void monitorShow(DCB *, MXS_MONITOR *); void monitor_show(DCB *, MXS_MONITOR *);
void monitorShowAll(DCB *); void monitor_show_all(DCB *);
void monitorList(DCB *); void monitor_list(DCB *);
RESULTSET *monitorGetList(); RESULTSET *monitor_get_list();
bool monitorAddServer(MXS_MONITOR *mon, SERVER *server); bool monitor_add_server(MXS_MONITOR *mon, SERVER *server);
void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server); void monitor_remove_server(MXS_MONITOR *mon, SERVER *server);
void monitorAddUser(MXS_MONITOR *, const char *, const char *); void monitor_add_user(MXS_MONITOR *, const char *, const char *);
void monitorAddParameters(MXS_MONITOR *monitor, MXS_CONFIG_PARAMETER *params); void monitor_add_parameters(MXS_MONITOR *monitor, MXS_CONFIG_PARAMETER *params);
bool monitorRemoveParameter(MXS_MONITOR *monitor, const char *key); bool monitor_remove_parameter(MXS_MONITOR *monitor, const char *key);
void monitorSetInterval (MXS_MONITOR *, unsigned long); void monitor_set_interval (MXS_MONITOR *, unsigned long);
bool monitorSetNetworkTimeout(MXS_MONITOR *, int, int, const char*); bool monitor_set_network_timeout(MXS_MONITOR *, int, int, const char*);
void monitorSetJournalMaxAge(MXS_MONITOR *mon, time_t value); void monitor_set_journal_max_age(MXS_MONITOR *mon, time_t value);
void monitorSetScriptTimeout(MXS_MONITOR *mon, uint32_t value); void monitor_set_script_timeout(MXS_MONITOR *mon, uint32_t value);
/** /**
* @brief Serialize a monitor to a file * @brief Serialize a monitor to a file

48
server/core/monitor.cc
View File

@ -192,7 +192,7 @@ monitor_free(MXS_MONITOR *mon)
* @param monitor The Monitor that should be started * @param monitor The Monitor that should be started
*/ */
void void
monitorStart(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params) monitor_start(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params)
{ {
if (monitor) if (monitor)
{ {
@ -220,7 +220,7 @@ monitorStart(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params)
/** /**
* Start all monitors * Start all monitors
*/ */
void monitorStartAll() void monitor_start_all()
{ {
MXS_MONITOR *ptr; MXS_MONITOR *ptr;
@ -230,7 +230,7 @@ void monitorStartAll()
{ {
if (ptr->active) if (ptr->active)
{ {
monitorStart(ptr, ptr->parameters); monitor_start(ptr, ptr->parameters);
} }
ptr = ptr->next; ptr = ptr->next;
} }
@ -243,7 +243,7 @@ void monitorStartAll()
* @param monitor The monitor to stop * @param monitor The monitor to stop
*/ */
void void
monitorStop(MXS_MONITOR *monitor) monitor_stop(MXS_MONITOR *monitor)
{ {
if (monitor) if (monitor)
{ {
@ -281,7 +281,7 @@ void monitor_deactivate(MXS_MONITOR* monitor)
* Shutdown all running monitors * Shutdown all running monitors
*/ */
void void
monitorStopAll() monitor_stop_all()
{ {
MXS_MONITOR *ptr; MXS_MONITOR *ptr;
@ -291,7 +291,7 @@ monitorStopAll()
{ {
if (ptr->active) if (ptr->active)
{ {
monitorStop(ptr); monitor_stop(ptr);
} }
ptr = ptr->next; ptr = ptr->next;
} }
@ -305,7 +305,7 @@ monitorStopAll()
* @param mon The Monitor instance * @param mon The Monitor instance
* @param server The Server to add to the monitoring * @param server The Server to add to the monitoring
*/ */
bool monitorAddServer(MXS_MONITOR *mon, SERVER *server) bool monitor_add_server(MXS_MONITOR *mon, SERVER *server)
{ {
bool rval = false; bool rval = false;
@ -335,7 +335,7 @@ bool monitorAddServer(MXS_MONITOR *mon, SERVER *server)
if (old_state == MONITOR_STATE_RUNNING) if (old_state == MONITOR_STATE_RUNNING)
{ {
monitorStop(mon); monitor_stop(mon);
} }
spinlock_acquire(&mon->lock); spinlock_acquire(&mon->lock);
@ -357,7 +357,7 @@ bool monitorAddServer(MXS_MONITOR *mon, SERVER *server)
if (old_state == MONITOR_STATE_RUNNING) if (old_state == MONITOR_STATE_RUNNING)
{ {
monitorStart(mon, mon->parameters); monitor_start(mon, mon->parameters);
} }
} }
@ -396,13 +396,13 @@ static void monitor_server_free_all(MXS_MONITORED_SERVER *servers)
* @param mon The Monitor instance * @param mon The Monitor instance
* @param server The Server to remove * @param server The Server to remove
*/ */
void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server) void monitor_remove_server(MXS_MONITOR *mon, SERVER *server)
{ {
monitor_state_t old_state = mon->state; monitor_state_t old_state = mon->state;
if (old_state == MONITOR_STATE_RUNNING) if (old_state == MONITOR_STATE_RUNNING)
{ {
monitorStop(mon); monitor_stop(mon);
} }
spinlock_acquire(&mon->lock); spinlock_acquire(&mon->lock);
@ -437,7 +437,7 @@ void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server)
if (old_state == MONITOR_STATE_RUNNING) if (old_state == MONITOR_STATE_RUNNING)
{ {
monitorStart(mon, mon->parameters); monitor_start(mon, mon->parameters);
} }
} }
@ -450,7 +450,7 @@ void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server)
* @param passwd The default password associated to the default user. * @param passwd The default password associated to the default user.
*/ */
void void
monitorAddUser(MXS_MONITOR *mon, const char *user, const char *passwd) monitor_add_user(MXS_MONITOR *mon, const char *user, const char *passwd)
{ {
if (user != mon->user) if (user != mon->user)
{ {
@ -469,7 +469,7 @@ monitorAddUser(MXS_MONITOR *mon, const char *user, const char *passwd)
* @param dcb DCB for printing output * @param dcb DCB for printing output
*/ */
void void
monitorShowAll(DCB *dcb) monitor_show_all(DCB *dcb)
{ {
MXS_MONITOR *ptr; MXS_MONITOR *ptr;
@ -479,7 +479,7 @@ monitorShowAll(DCB *dcb)
{ {
if (ptr->active) if (ptr->active)
{ {
monitorShow(dcb, ptr); monitor_show(dcb, ptr);
} }
ptr = ptr->next; ptr = ptr->next;
} }
@ -492,7 +492,7 @@ monitorShowAll(DCB *dcb)
* @param dcb DCB for printing output * @param dcb DCB for printing output
*/ */
void void
monitorShow(DCB *dcb, MXS_MONITOR *monitor) monitor_show(DCB *dcb, MXS_MONITOR *monitor)
{ {
const char *state; const char *state;
@ -559,7 +559,7 @@ monitorShow(DCB *dcb, MXS_MONITOR *monitor)
* @param dcb DCB for printing output * @param dcb DCB for printing output
*/ */
void void
monitorList(DCB *dcb) monitor_list(DCB *dcb)
{ {
MXS_MONITOR *ptr; MXS_MONITOR *ptr;
@ -640,7 +640,7 @@ MXS_MONITOR* monitor_repurpose_destroyed(const char* name, const char* module)
* @param interval The sampling interval in milliseconds * @param interval The sampling interval in milliseconds
*/ */
void void
monitorSetInterval(MXS_MONITOR *mon, unsigned long interval) monitor_set_interval(MXS_MONITOR *mon, unsigned long interval)
{ {
mon->interval = interval; mon->interval = interval;
} }
@ -651,12 +651,12 @@ monitorSetInterval(MXS_MONITOR *mon, unsigned long interval)
* @param mon The monitor instance * @param mon The monitor instance
* @param interval The journal age in seconds * @param interval The journal age in seconds
*/ */
void monitorSetJournalMaxAge(MXS_MONITOR *mon, time_t value) void monitor_set_journal_max_age(MXS_MONITOR *mon, time_t value)
{ {
mon->journal_max_age = value; mon->journal_max_age = value;
} }
void monitorSetScriptTimeout(MXS_MONITOR *mon, uint32_t value) void monitor_set_script_timeout(MXS_MONITOR *mon, uint32_t value)
{ {
mon->script_timeout = value; mon->script_timeout = value;
} }
@ -668,7 +668,7 @@ void monitorSetScriptTimeout(MXS_MONITOR *mon, uint32_t value)
* @param type The timeout handling type * @param type The timeout handling type
* @param value The timeout to set * @param value The timeout to set
*/ */
bool monitorSetNetworkTimeout(MXS_MONITOR *mon, int type, int value, const char* key) bool monitor_set_network_timeout(MXS_MONITOR *mon, int type, int value, const char* key)
{ {
bool rval = true; bool rval = true;
@ -751,7 +751,7 @@ monitorRowCallback(RESULTSET *set, void *data)
* @return A Result set * @return A Result set
*/ */
RESULTSET * RESULTSET *
monitorGetList() monitor_get_list()
{ {
RESULTSET *set; RESULTSET *set;
int *data; int *data;
@ -856,7 +856,7 @@ bool check_monitor_permissions(MXS_MONITOR* monitor, const char* query)
* @param monitor Monitor * @param monitor Monitor
* @param params Config parameters * @param params Config parameters
*/ */
void monitorAddParameters(MXS_MONITOR *monitor, MXS_CONFIG_PARAMETER *params) void monitor_add_parameters(MXS_MONITOR *monitor, MXS_CONFIG_PARAMETER *params)
{ {
spinlock_acquire(&monitor->lock); spinlock_acquire(&monitor->lock);
@ -882,7 +882,7 @@ void monitorAddParameters(MXS_MONITOR *monitor, MXS_CONFIG_PARAMETER *params)
spinlock_release(&monitor->lock); spinlock_release(&monitor->lock);
} }
bool monitorRemoveParameter(MXS_MONITOR *monitor, const char *key) bool monitor_remove_parameter(MXS_MONITOR *monitor, const char *key)
{ {
MXS_CONFIG_PARAMETER *prev = NULL; MXS_CONFIG_PARAMETER *prev = NULL;
bool rval = false; bool rval = false;

4
server/core/resource.cc
View File

@ -239,14 +239,14 @@ private:
HttpResponse cb_stop_monitor(const HttpRequest& request) HttpResponse cb_stop_monitor(const HttpRequest& request)
{ {
MXS_MONITOR* monitor = monitor_find(request.uri_part(1).c_str()); MXS_MONITOR* monitor = monitor_find(request.uri_part(1).c_str());
monitorStop(monitor); monitor_stop(monitor);
return HttpResponse(MHD_HTTP_NO_CONTENT); return HttpResponse(MHD_HTTP_NO_CONTENT);
} }
HttpResponse cb_start_monitor(const HttpRequest& request) HttpResponse cb_start_monitor(const HttpRequest& request)
{ {
MXS_MONITOR* monitor = monitor_find(request.uri_part(1).c_str()); MXS_MONITOR* monitor = monitor_find(request.uri_part(1).c_str());
monitorStart(monitor, monitor->parameters); monitor_start(monitor, monitor->parameters);
return HttpResponse(MHD_HTTP_NO_CONTENT); return HttpResponse(MHD_HTTP_NO_CONTENT);
} }

4
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -25,7 +25,7 @@
#include <maxscale/mysql_utils.h> #include <maxscale/mysql_utils.h>
#include <maxscale/secrets.h> #include <maxscale/secrets.h>
#include <maxscale/utils.h> #include <maxscale/utils.h>
// TODO: For monitorAddParameters // TODO: For monitor_add_parameters
#include "../../../core/internal/monitor.h" #include "../../../core/internal/monitor.h"
using std::string; using std::string;
@ -890,7 +890,7 @@ void MariaDBMonitor::disable_setting(const char* setting)
MXS_CONFIG_PARAMETER p = {}; MXS_CONFIG_PARAMETER p = {};
p.name = const_cast<char*>(setting); p.name = const_cast<char*>(setting);
p.value = const_cast<char*>("false"); p.value = const_cast<char*>("false");
monitorAddParameters(m_monitor_base, &p); monitor_add_parameters(m_monitor_base, &p);
} }
/** /**

10
server/modules/routing/debugcli/debugcmd.cc
View File

@ -213,7 +213,7 @@ struct subcommand showoptions[] =
{0} {0}
}, },
{ {
"monitor", 1, 1, (FN)monitorShow, "monitor", 1, 1, (FN)monitor_show,
"Show monitor details", "Show monitor details",
"Usage: show monitor MONITOR\n" "Usage: show monitor MONITOR\n"
"\n" "\n"
@ -224,7 +224,7 @@ struct subcommand showoptions[] =
{ARG_TYPE_MONITOR} {ARG_TYPE_MONITOR}
}, },
{ {
"monitors", 0, 0, (FN)monitorShowAll, "monitors", 0, 0, (FN)monitor_show_all,
"Show all monitors", "Show all monitors",
"Usage: show monitors", "Usage: show monitors",
{0} {0}
@ -396,7 +396,7 @@ struct subcommand listoptions[] =
{0} {0}
}, },
{ {
"monitors", 0, 0, (FN)monitorList, "monitors", 0, 0, (FN)monitor_list,
"List all monitors", "List all monitors",
"Usage: list monitors", "Usage: list monitors",
{0} {0}
@ -2409,7 +2409,7 @@ show_log_throttling(DCB *dcb)
static void static void
shutdown_monitor(DCB *dcb, MXS_MONITOR *monitor) shutdown_monitor(DCB *dcb, MXS_MONITOR *monitor)
{ {
monitorStop(monitor); monitor_stop(monitor);
} }
/** /**
@ -2421,7 +2421,7 @@ shutdown_monitor(DCB *dcb, MXS_MONITOR *monitor)
static void static void
restart_monitor(DCB *dcb, MXS_MONITOR *monitor) restart_monitor(DCB *dcb, MXS_MONITOR *monitor)
{ {
monitorStart(monitor, monitor->parameters); monitor_start(monitor, monitor->parameters);
} }
/** /**

2
server/modules/routing/maxinfo/maxinfo.cc
View File

@ -691,7 +691,7 @@ static struct uri_table
{ "/services", serviceGetList }, { "/services", serviceGetList },
{ "/listeners", serviceGetListenerList }, { "/listeners", serviceGetListenerList },
{ "/modules", moduleGetList }, { "/modules", moduleGetList },
{ "/monitors", monitorGetList }, { "/monitors", monitor_get_list },
{ "/sessions", maxinfoSessionsAll }, { "/sessions", maxinfoSessionsAll },
{ "/clients", maxinfoClientSessions }, { "/clients", maxinfoClientSessions },
{ "/servers", serverGetList }, { "/servers", serverGetList },

6
server/modules/routing/maxinfo/maxinfo_exec.cc
View File

@ -238,7 +238,7 @@ exec_show_monitors(DCB *dcb, MAXINFO_TREE *tree)
{ {
RESULTSET *set; RESULTSET *set;
if ((set = monitorGetList()) == NULL) if ((set = monitor_get_list()) == NULL)
{ {
return; return;
} }
@ -563,7 +563,7 @@ void exec_shutdown_monitor(DCB *dcb, MAXINFO_TREE *tree)
MXS_MONITOR* monitor = monitor_find(tree->value); MXS_MONITOR* monitor = monitor_find(tree->value);
if (monitor) if (monitor)
{ {
monitorStop(monitor); monitor_stop(monitor);
maxinfo_send_ok(dcb); maxinfo_send_ok(dcb);
} }
else else
@ -673,7 +673,7 @@ void exec_restart_monitor(DCB *dcb, MAXINFO_TREE *tree)
MXS_MONITOR* monitor = monitor_find(tree->value); MXS_MONITOR* monitor = monitor_find(tree->value);
if (monitor) if (monitor)
{ {
monitorStart(monitor, monitor->parameters); monitor_start(monitor, monitor->parameters);
maxinfo_send_ok(dcb); maxinfo_send_ok(dcb);
} }
else else