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

Use dedicated header in NDBClusterMon

Browse Source 
NDBClusterMonitor used the MariaDBMonitor header instead of its own.
This commit is contained in:
Esa Korhonen
2018-02-19 15:10:20 +02:00
parent db9169be08
commit b9d80f6061
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
#define MXS_MODULE_NAME "mariadbmon" #define MXS_MODULE_NAME "mariadbmon"
#include "../mysqlmon.h" #include "mariadbmon.h"
#include <inttypes.h> #include <inttypes.h>
#include <limits> #include <limits>
#include <string> #include <string>

4
server/modules/monitor/mysqlmon.h → server/modules/monitor/mariadbmon/mariadbmon.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#ifndef _MYSQLMON_H #ifndef _MARIADBMON_H
#define _MYSQLMON_H #define _MARIADBMON_H
/* /*
* Copyright (c) 2016 MariaDB Corporation Ab * Copyright (c) 2016 MariaDB Corporation Ab
* *

10
server/modules/monitor/ndbclustermon/ndbclustermon.c
View File

@ -17,7 +17,7 @@
#define MXS_MODULE_NAME "ndbclustermon" #define MXS_MODULE_NAME "ndbclustermon"
#include "../mysqlmon.h" #include "ndbclustermon.h"
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/mysql_utils.h> #include <maxscale/mysql_utils.h>
@ -103,7 +103,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
static void * static void *
startMonitor(MXS_MONITOR *mon, const MXS_CONFIG_PARAMETER *params) startMonitor(MXS_MONITOR *mon, const MXS_CONFIG_PARAMETER *params)
{ {
MYSQL_MONITOR *handle = mon->handle; NDBC_MONITOR *handle = mon->handle;
bool have_events = false, script_error = false; bool have_events = false, script_error = false;
if (handle != NULL) if (handle != NULL)
@ -113,7 +113,7 @@ startMonitor(MXS_MONITOR *mon, const MXS_CONFIG_PARAMETER *params)
} }
else else
{ {
if ((handle = (MYSQL_MONITOR *) MXS_MALLOC(sizeof(MYSQL_MONITOR))) == NULL) if ((handle = (NDBC_MONITOR *) MXS_MALLOC(sizeof(NDBC_MONITOR))) == NULL)
{ {
return NULL; return NULL;
} }
@ -154,7 +154,7 @@ startMonitor(MXS_MONITOR *mon, const MXS_CONFIG_PARAMETER *params)
static void static void
stopMonitor(MXS_MONITOR *mon) stopMonitor(MXS_MONITOR *mon)
{ {
MYSQL_MONITOR *handle = (MYSQL_MONITOR *) mon->handle; NDBC_MONITOR *handle = (NDBC_MONITOR *) mon->handle;
handle->shutdown = 1; handle->shutdown = 1;
thread_wait(handle->thread); thread_wait(handle->thread);
@ -306,7 +306,7 @@ monitorDatabase(MXS_MONITORED_SERVER *database, char *defaultUser, char *default
static void static void
monitorMain(void *arg) monitorMain(void *arg)
{ {
MYSQL_MONITOR *handle = (MYSQL_MONITOR*)arg; NDBC_MONITOR *handle = (NDBC_MONITOR*)arg;
MXS_MONITOR* mon = handle->monitor; MXS_MONITOR* mon = handle->monitor;
MXS_MONITORED_SERVER *ptr; MXS_MONITORED_SERVER *ptr;
size_t nrounds = 0; size_t nrounds = 0;

39
server/modules/monitor/ndbclustermon/ndbclustermon.h
View File

@ -1,5 +1,6 @@
#ifndef _MYSQLMON_H #pragma once
#define _MYSQLMON_H #ifndef _NDBCMON_H
#define _NDBCMON_H
/* /*
* Copyright (c) 2016 MariaDB Corporation Ab * Copyright (c) 2016 MariaDB Corporation Ab
* *
@ -13,39 +14,27 @@
* Public License. * Public License.
*/ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <monitor.h>
#include <spinlock.h>
#include <thread.h>
#include <mysql.h>
#include <mysqld_error.h>
#include <log_manager.h>
#include <secrets.h>
#include <dcb.h>
#include <modinfo.h>
#include <config.h>
#include <externcmd.h>
/** /**
* @file ndbclustermon.h - The NDB Cluster monitor * @file ndbclustermon.h - The NDB Cluster monitor
* *
*/ */
/** #include <maxscale/monitor.h>
* The handle for an instance of a NDB Cluster Monitor module #include <maxscale/spinlock.h>
*/ #include <maxscale/thread.h>
// The handle for an instance of a NDB Cluster Monitor module
typedef struct typedef struct
{ {
THREAD thread; /**< Monitor thread */
SPINLOCK lock; /**< The monitor spinlock */ SPINLOCK lock; /**< The monitor spinlock */
pthread_t tid; /**< id of monitor thread */ unsigned long id; /**< Monitor ID */
uint64_t events; /*< enabled events */
int shutdown; /**< Flag to shutdown the monitor thread */ int shutdown; /**< Flag to shutdown the monitor thread */
int status; /**< Monitor status */ int status; /**< Monitor status */
unsigned long id; /**< Monitor ID */ MXS_MONITORED_SERVER *master; /**< Master server for MySQL Master/Slave replication */
MONITOR_SERVERS *master; /**< Master server for MySQL Master/Slave replication */
char* script; /*< Script to call when state changes occur on servers */ char* script; /*< Script to call when state changes occur on servers */
bool events[MAX_MONITOR_EVENT]; /*< enabled events */ MXS_MONITOR* monitor;
} MYSQL_MONITOR; } NDBC_MONITOR;
#endif #endif