Use dedicated header in NDBClusterMon

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

View File

@ -1,5 +1,6 @@
#ifndef _MYSQLMON_H
#define _MYSQLMON_H
#pragma once
#ifndef _NDBCMON_H
#define _NDBCMON_H
/*
* Copyright (c) 2016 MariaDB Corporation Ab
*
@ -13,39 +14,27 @@
* 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
*
*/
/**
* The handle for an instance of a NDB Cluster Monitor module
*/
#include <maxscale/monitor.h>
#include <maxscale/spinlock.h>
#include <maxscale/thread.h>
// The handle for an instance of a NDB Cluster Monitor module
typedef struct
{
THREAD thread; /**< Monitor thread */
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 status; /**< Monitor status */
unsigned long id; /**< Monitor ID */
MONITOR_SERVERS *master; /**< Master server for MySQL Master/Slave replication */
MXS_MONITORED_SERVER *master; /**< Master server for MySQL Master/Slave replication */
char* script; /*< Script to call when state changes occur on servers */
bool events[MAX_MONITOR_EVENT]; /*< enabled events */
} MYSQL_MONITOR;
MXS_MONITOR* monitor;
} NDBC_MONITOR;
#endif