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

Log variables moved to log_manager.h

Browse Source 
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
This commit is contained in:
Johan Wikman
2015-11-04 14:26:53 +02:00
parent 0accf869de
commit 834a88aeda
55 changed files with 10 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/GaleraHACRoute.c
View File

@ -47,8 +47,6 @@
#include <mysql_client_server_protocol.h>
extern int lm_enabled_logfiles_bitmask;
static char *version_str = "V1.0.0";
/* The router entry points */

4
server/modules/routing/binlog/blr.c
View File

@ -75,10 +75,6 @@
#include <ini.h>
#include <sys/stat.h>
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static char *version_str = "V2.0.0";
/* The router entry points */

5
server/modules/routing/binlog/blr_cache.c
View File

@ -53,11 +53,6 @@
#include <log_manager.h>
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* Initialise the cache for this instanceof the binlog router. As a side
* effect also determine the binlog file to read and the position to read

4
server/modules/routing/binlog/blr_file.c
View File

@ -63,10 +63,6 @@
#include <skygw_utils.h>
#include <log_manager.h>
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static int blr_file_create(ROUTER_INSTANCE *router, char *file);
static void blr_file_append(ROUTER_INSTANCE *router, char *file);
static void blr_log_header(logfile_id_t file, char *msg, uint8_t *ptr);

4
server/modules/routing/binlog/blr_master.c
View File

@ -78,10 +78,6 @@
#include <mysql_client_server_protocol.h>
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static GWBUF *blr_make_query(char *statement);
static GWBUF *blr_make_registration(ROUTER_INSTANCE *router);
static GWBUF *blr_make_binlog_dump(ROUTER_INSTANCE *router);

4
server/modules/routing/binlog/blr_slave.c
View File

@ -154,10 +154,6 @@ static int blr_slave_send_heartbeat(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave
void poll_fake_write_event(DCB *dcb);
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* Process a request packet from the slave server.
*

3
server/modules/routing/binlog/maxbinlogcheck.c
View File

@ -63,9 +63,6 @@
#include <version.h>
#include <gwdirs.h>
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
extern int blr_read_events_all_events(ROUTER_INSTANCE *router, int fix, int debug);
extern uint32_t extract_field(uint8_t *src, int bits);
static void printVersion(const char *progname);

3
server/modules/routing/binlog/test/testbinlog.c
View File

@ -51,9 +51,6 @@
#include <version.h>
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static void printVersion(const char *progname);
static void printUsage(const char *progname);
extern int blr_test_parse_change_master_command(char *input, char *error_string, CHANGE_MASTER_OPTIONS *config);

5
server/modules/routing/cli.c
View File

@ -53,11 +53,6 @@ MODULE_INFO info = {
"The admin user interface"
};
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static char *version_str = "V1.0.0";
/* The router entry points */

5
server/modules/routing/debugcli.c
View File

@ -52,11 +52,6 @@ MODULE_INFO info = {
"The debug user interface"
};
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static char *version_str = "V1.1.1";
/* The router entry points */

5
server/modules/routing/maxinfo/maxinfo.c
View File

@ -63,11 +63,6 @@ MODULE_INFO info = {
"The MaxScale Information Schema"
};
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
extern char *create_hex_sha1_sha1_passwd(char *passwd);
static char *version_str = "V1.0.0";

5
server/modules/routing/maxinfo/maxinfo_error.c
View File

@ -45,11 +45,6 @@
#include <log_manager.h>
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* Process a parse error and send error report to client
*

4
server/modules/routing/maxinfo/maxinfo_exec.c
View File

@ -49,10 +49,6 @@
#include <resultset.h>
#include <maxconfig.h>
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
static void exec_show(DCB *dcb, MAXINFO_TREE *tree);
static void exec_select(DCB *dcb, MAXINFO_TREE *tree);
static void exec_show_variables(DCB *dcb, MAXINFO_TREE *filter);

5
server/modules/routing/readconnroute.c
View File

@ -92,11 +92,6 @@
#include "modutil.h"
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
MODULE_INFO info = {
MODULE_API_ROUTER,
MODULE_GA,

4
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -47,10 +47,6 @@ MODULE_INFO info = {
#define RWSPLIT_TRACE_MSG_LEN 1000
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* @file readwritesplit.c The entry points for the read/write query splitting
* router module.

4
server/modules/routing/schemarouter/schemarouter.c
View File

@ -52,10 +52,6 @@ MODULE_INFO info = {
};
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* @file schemarouter.c The entry points for the simple sharding
* router module.

5
server/modules/routing/schemarouter/sharding_common.c
View File

@ -18,11 +18,6 @@
#include <sharding_common.h>
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* Extract the database name from a COM_INIT_DB or literal USE ... query.
* @param buf Buffer with the database change query

4
server/modules/routing/schemarouter/shardrouter.c
View File

@ -46,10 +46,6 @@ MODULE_INFO info = {
};
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* @file shardrouter.c
*