Merge pull request #843 from satori/refactor_headers

Refactor header includes.
sysown · Dec 21, 2016 · 32b412f · 32b412f
2 parents b118592 + 3665ba0
commit 32b412f
Show file tree

Hide file tree

Showing 52 changed files with 304 additions and 356 deletions.
diff --git a/include/MySQL_Authentication.hpp b/include/MySQL_Authentication.hpp
@@ -1,9 +1,11 @@
 #ifndef __CLASS_MYSQL_AUTHENTICATION_H
 #define __CLASS_MYSQL_AUTHENTICATION_H
 
-#include "proxysql.h"
-#include "cpp.h"
+#include <unordered_map>
 
+#include "proxysql.h"
+#include "proxysql_atomic.h"
+#include "proxysql_mem.h"
 
 typedef struct _account_details_t {
 	char *username;

diff --git a/include/MySQL_Data_Stream.h b/include/MySQL_Data_Stream.h
@@ -1,9 +1,8 @@
 #ifndef __CLASS_MYSQL_DATA_STREAM_H
 #define __CLASS_MYSQL_DATA_STREAM_H
 
-#include "proxysql.h"
-#include "cpp.h"
-
+#include "mysql_connection.h"
+#include "proxysql_mem.h"
 
 #define QUEUE_T_DEFAULT_SIZE	32768
 

diff --git a/include/MySQL_HostGroups_Manager.h b/include/MySQL_HostGroups_Manager.h
@@ -1,11 +1,10 @@
 #ifndef __CLASS_MYSQL_HOSTGROUPS_MANAGER_H
 #define __CLASS_MYSQL_HOSTGROUPS_MANAGER_H
-#include "proxysql.h"
-#include "cpp.h"
 
+#include <cassert>
 #include <thread>
 
-#include "thread.h"
+#include "gen_utils.h"
 #include "wqueue.h"
 
 /*

diff --git a/include/MySQL_Logger.hpp b/include/MySQL_Logger.hpp
@@ -1,8 +1,7 @@
 #ifndef __CLASS_MYSQL_LOGGER_H
 #define __CLASS_MYSQL_LOGGER_H
-#include "proxysql.h"
-#include "cpp.h"
 
+#include "MySQL_Session.h"
 
 class MySQL_Event {
 	private:

diff --git a/include/MySQL_Monitor.hpp b/include/MySQL_Monitor.hpp
@@ -1,8 +1,9 @@
 #ifndef __CLASS_MYSQL_MONITOR_H
 #define __CLASS_MYSQL_MONITOR_H
+
+#include "mysql_client.h"
 #include "proxysql.h"
-#include "cpp.h"
-#include "thread.h"
+#include "sqlite3db.h"
 #include "wqueue.h"
 
 

diff --git a/include/MySQL_PreparedStatement.h b/include/MySQL_PreparedStatement.h
@@ -1,8 +1,12 @@
 #ifndef CLASS_MYSQL_PREPARED_STATEMENT_H
 #define CLASS_MYSQL_PREPARED_STATEMENT_H
 
+#include <map>
+#include <stack>
+
+#include "mysql_client.h"
 #include "proxysql.h"
-#include "cpp.h"
+#include "proxysql_atomic.h"
 
 /*
 One of the main challenge in handling prepared statement (PS) is that a single

diff --git a/include/MySQL_Protocol.h b/include/MySQL_Protocol.h
@@ -2,7 +2,8 @@
 #define __CLASS_MYSQL_PROTOCOL_H
 
 #include "proxysql.h"
-#include "cpp.h"
+
+#include "MySQL_PreparedStatement.h"
 
 #define RESULTSET_BUFLEN 16300
 

diff --git a/include/MySQL_Session.h b/include/MySQL_Session.h
@@ -1,7 +1,11 @@
 #ifndef __CLASS_MYSQL_SESSION_H
 #define __CLASS_MYSQL_SESSION_H
 #include "proxysql.h"
-#include "cpp.h"
+
+#include "mysql_backend.h"
+#include "proxysql_admin.h"
+#include "query_processor.h"
+
 
 // these structs will be used for various regex hardcoded
 // their initial use will be for sql_log_bin , sql_mode and time_zone

diff --git a/include/MySQL_Thread.h b/include/MySQL_Thread.h
@@ -1,10 +1,14 @@
 #ifndef __CLASS_MYSQL_THREAD_H
 #define __CLASS_MYSQL_THREAD_H
 #define ____CLASS_STANDARD_MYSQL_THREAD_H
-#include "proxysql.h"
-#include "cpp.h"
+
+#include <poll.h>
 #include <sys/epoll.h>
 
+#include "MySQL_Data_Stream.h"
+#include "StatCounters.h"
+
+#define CACHE_LINE_SIZE 64
 #define MIN_POLL_LEN 8
 #define MIN_POLL_DELETE_RATIO  8
 #define MY_EPOLL_THREAD_MAXEVENTS 128

diff --git a/include/StatCounters.h b/include/StatCounters.h
@@ -1,6 +1,8 @@
 #ifndef __CLASS_STAT_COUNTERS_H
 #define __CLASS_STAT_COUNTERS_H
+
 #include "proxysql_atomic.h"
+
 class StatCounters {
 	private:
 	bool with_lock;

diff --git a/include/configfile.hpp b/include/configfile.hpp
@@ -1,6 +1,8 @@
 #ifndef __CLASS_PROXYSQL_CONFIGFILE_H
 #define __CLASS_PROXYSQL_CONFIGFILE_H
 
+#include <sys/stat.h>
+
 #include "libconfig.h++"
 
 using namespace libconfig;

diff --git a/include/cpp.h b/include/cpp.h
diff --git a/include/fileutils.hpp b/include/fileutils.hpp
@@ -1,7 +1,8 @@
-#include <unistd.h>
-
 #ifndef __CLASS_FILEUTILS_H
 #define __CLASS_FILEUTILS_H
+
+#include <unistd.h>
+
 class FileUtils {
 	public:
 	static bool isReadable(const char *pathname) {
@@ -13,4 +14,5 @@ class FileUtils {
 		return false;
 	};
 };
+
 #endif /* __CLASS_FILEUTILS_H */
diff --git a/include/gen_utils.h b/include/gen_utils.h
@@ -1,5 +1,6 @@
 #ifndef __CLASS_PTR_ARRAY_H
 #define __CLASS_PTR_ARRAY_H
+
 #include "proxysql.h"
 
 #define MIN_ARRAY_LEN 8

diff --git a/include/mysql_backend.h b/include/mysql_backend.h
@@ -1,8 +1,7 @@
 #ifndef __CLASS_MYSQL_BACKEND_H
 #define __CLASS_MYSQL_BACKEND_H
-#include "proxysql.h"
-#include "cpp.h"
 
+#include "MySQL_Data_Stream.h"
 
 class MySQL_Backend
 {

diff --git a/include/mysql_client.h b/include/mysql_client.h
@@ -0,0 +1,8 @@
+#ifndef PROXYSQL_MYSQL_CLIENT_H__
+#define PROXYSQL_MYSQL_CLIENT_H__
+
+#define HAVE_BOOL
+#include "mysql.h"
+#undef max_allowed_packet
+
+#endif // PROXYSQL_MYSQL_CLIENT_H__
diff --git a/include/mysql_connection.h b/include/mysql_connection.h
@@ -1,8 +1,8 @@
 #ifndef __CLASS_MYSQL_CONNECTION_H
 #define __CLASS_MYSQL_CONNECTION_H
 
-#include "proxysql.h"
-#include "cpp.h"
+#include "MySQL_HostGroups_Manager.h"
+#include "MySQL_Protocol.h"
 
 #define STATUS_MYSQL_CONNECTION_TRANSACTION          0x00000001
 #define STATUS_MYSQL_CONNECTION_COMPRESSION          0x00000002

diff --git a/include/network.h b/include/network.h
@@ -0,0 +1,10 @@
+#ifndef PROXYSQL_NETWORK_H__
+#define PROXYSQL_NETWORK_H__
+
+#include <cstdint>
+
+int listen_on_port(char *ip, uint16_t port, int backlog, bool reuseport=false);
+int listen_on_unix(char *, int);
+int connect_socket(char *, int);
+
+#endif // PROXYSQL_NETWORK_H__
diff --git a/include/proxysql.h b/include/proxysql.h
@@ -1,66 +1,12 @@
-#ifdef __cplusplus
-#include <string>
-#include <stack>
-
-#include <algorithm>
-
-#ifndef EZOPTION
-#define EZOPTION
-#endif /* EZOPTION */
-#endif
-#include <search.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <time.h>
-#include <string.h>
+#ifndef PROXYSQL_H__
+#define PROXYSQL_H__
 #ifdef NDEBUG
 #undef NDEBUG
 #endif
-#include <assert.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <pthread.h>
-#include <sys/wait.h>
-
-#include <netinet/in.h>
-#include <sys/un.h>
-#include <netinet/tcp.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <netdb.h>
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#include <signal.h>
-#include <errno.h>
-#include <ctype.h>
-#include <openssl/sha.h>
-#include <openssl/md5.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <poll.h>
-#include <execinfo.h>
-
-#include <dlfcn.h>
-
-#include <sys/ioctl.h>
-
-#define HAVE_BOOL
-#include "my_global.h"
-#include "my_pthread.h"
-#include "mysql.h"
-
-#include "proxysql_mem.h"
 
 #include "proxysql_structs.h"
-#include "proxysql_debug.h"
 #include "proxysql_macros.h"
 
-#include "jemalloc.h"
-
 #ifdef DEBUG
 //#define VALGRIND_ENABLE_ERROR_REPORTING
 //#define VALGRIND_DISABLE_ERROR_REPORTING
@@ -70,10 +16,6 @@
 #define VALGRIND_DISABLE_ERROR_REPORTING
 #endif /* DEBUG */
 
-#include "sqlite3.h"
-
-#include "c_tokenizer.h"
-
 #ifdef DEBUG
 #define DEB "_DEBUG"
 #else
@@ -85,13 +27,6 @@
 #ifndef PROXYSQL_FUNC_DEFS
 #define PROXYSQL_FUNC_DEFS
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-int listen_on_port(char *ip, uint16_t port, int backlog, bool reuseport=false);
-int listen_on_unix(char *, int);
-int connect_socket(char *, int);
 int config_file_is_readable(char *);
 unsigned int CPY3(unsigned char *);
 
@@ -100,16 +35,11 @@ int pkt_end(unsigned char *, unsigned int);
 int pkt_com_query(unsigned char *, unsigned int);
 enum MySQL_response_type mysql_response(unsigned char *, unsigned int);
 
-void proxy_error_func(const char *, ...);
-
 #ifdef DEBUG
 void init_debug_struct();
 void init_debug_struct_from_cmdline();
 void proxy_debug_func(enum debug_module, int, int, const char *, int, const char *, const char *, ...);
 #endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* PROXYSQL_FUNC_DEFS */
+#endif // PROXYSQL_H__
diff --git a/include/proxysql_admin.h b/include/proxysql_admin.h
@@ -1,8 +1,8 @@
 #ifndef __CLASS_PROXYSQL_ADMIN_H
 #define __CLASS_PROXYSQL_ADMIN_H
+
 #include "proxysql.h"
-#include "cpp.h"
-#include <vector>
+#include "sqlite3db.h"
 
 typedef struct { uint32_t hash; uint32_t key; } t_symstruct;
 

diff --git a/include/proxysql_atomic.h b/include/proxysql_atomic.h
@@ -1,13 +1,16 @@
 #ifndef PROXYSQL_ATOMIC
 #define PROXYSQL_ATOMIC 
-/*
+
+#include <cstring>
+#include <unistd.h>
+
 typedef unsigned spinlock;
 typedef struct _rwlock_t rwlock_t;
 struct _rwlock_t {
     spinlock lock;
     unsigned readers;
 };
-*/
+
 #define atomic_inc(P) __sync_add_and_fetch((P), 1)
 #define atomic_dec(P) __sync_add_and_fetch((P), -1)
 

diff --git a/include/proxysql_debug.h b/include/proxysql_debug.h
@@ -1,13 +1,10 @@
+#ifndef PROXYSQL_DEBUG_H__
+#define PROXYSQL_DEBUG_H__
+
+#include <ctime>
+
+void proxy_error_func(const char *, ...);
 
-/*
-#ifdef DEBUG
-#ifndef DEBUG_EXTERN
-#define DEBUG_EXTERN
-extern debug_level *gdbg_lvl;
-extern int gdbg;
-#endif 
-#endif 
-*/
 #ifdef DEBUG
 #define PROXY_TRACE() { proxy_debug(PROXY_DEBUG_GENERIC,10,"TRACE\n"); }
 #else
@@ -108,3 +105,4 @@ extern int gdbg;
 #ifdef DEBUG
 //void *debug_logger();
 #endif
+#endif //PROXYSQL_DEBUG_H__