From 7cac78472558738c8f314f1663d2dbfb9439fd85 Mon Sep 17 00:00:00 2001 From: XieHan Date: Mon, 4 Oct 2021 00:43:03 +0800 Subject: [PATCH] Fix 'include' errors --- src/algorithm/DnsRoutine.h | 3 +-- src/algorithm/MapReduce.h | 1 - src/factory/HttpTaskImpl.cc | 1 - src/factory/WFTaskFactory.cc | 1 + src/factory/WFTaskFactory.h | 1 - src/kernel/IOService_linux.h | 1 + src/kernel/SleepRequest.h | 1 + src/kernel/mpoller.h | 3 +-- src/manager/DnsCache.h | 2 -- src/manager/RouteManager.cc | 2 +- src/manager/UpstreamManager.cc | 1 + src/manager/UpstreamManager.h | 4 +--- src/manager/WFGlobal.cc | 9 ++++----- src/manager/WFGlobal.h | 26 ++++++++++---------------- src/nameservice/UpstreamPolicies.cc | 2 +- src/nameservice/UpstreamPolicies.h | 7 ++----- src/nameservice/WFDnsResolver.cc | 2 +- src/nameservice/WFNameService.cc | 1 + src/nameservice/WFServiceGovernance.cc | 4 +++- src/nameservice/WFServiceGovernance.h | 3 --- src/protocol/DnsUtil.h | 1 + src/protocol/HttpUtil.cc | 4 ++-- src/protocol/HttpUtil.h | 2 +- src/protocol/KafkaMessage.cc | 1 + src/protocol/KafkaMessage.h | 3 +-- src/protocol/MySQLMessage.cc | 1 + src/protocol/MySQLMessage.h | 1 - src/protocol/MySQLMessage.inl | 1 - src/protocol/MySQLResult.cc | 2 ++ src/protocol/MySQLResult.h | 3 ++- src/protocol/RedisMessage.cc | 2 +- src/protocol/RedisMessage.h | 3 +-- src/protocol/http_parser.c | 1 - src/protocol/mysql_parser.c | 1 + src/protocol/mysql_parser.h | 2 +- src/protocol/redis_parser.c | 2 +- src/protocol/redis_parser.h | 2 ++ src/server/WFMySQLServer.cc | 1 + src/server/WFServer.h | 3 +-- src/util/EncodeStream.cc | 4 ++-- src/util/LRUCache.h | 2 +- src/util/MD5Util.cc | 2 +- src/util/StringUtil.cc | 2 ++ src/util/StringUtil.h | 1 + src/util/URIParser.cc | 3 ++- tutorial/tutorial-05-http_proxy.cc | 4 +++- 46 files changed, 62 insertions(+), 67 deletions(-) diff --git a/src/algorithm/DnsRoutine.h b/src/algorithm/DnsRoutine.h index b697f100..f31b7a5d 100644 --- a/src/algorithm/DnsRoutine.h +++ b/src/algorithm/DnsRoutine.h @@ -18,8 +18,7 @@ #ifndef _DNSROUTINE_H_ #define _DNSROUTINE_H_ -#include -#include + #include #include diff --git a/src/algorithm/MapReduce.h b/src/algorithm/MapReduce.h index 3bd2d83d..23184c3a 100644 --- a/src/algorithm/MapReduce.h +++ b/src/algorithm/MapReduce.h @@ -22,7 +22,6 @@ #include #include #include -#include #include "rbtree.h" namespace algorithm diff --git a/src/factory/HttpTaskImpl.cc b/src/factory/HttpTaskImpl.cc index e0a431a7..437e8d15 100644 --- a/src/factory/HttpTaskImpl.cc +++ b/src/factory/HttpTaskImpl.cc @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/src/factory/WFTaskFactory.cc b/src/factory/WFTaskFactory.cc index 4e780ef6..be6ab3d8 100644 --- a/src/factory/WFTaskFactory.cc +++ b/src/factory/WFTaskFactory.cc @@ -18,6 +18,7 @@ */ #include +#include #include #include #include "list.h" diff --git a/src/factory/WFTaskFactory.h b/src/factory/WFTaskFactory.h index 7fe3bcf1..e13e51a4 100644 --- a/src/factory/WFTaskFactory.h +++ b/src/factory/WFTaskFactory.h @@ -30,7 +30,6 @@ #include "HttpMessage.h" #include "MySQLMessage.h" #include "DnsMessage.h" -#include "DnsRoutine.h" #include "Workflow.h" #include "WFTask.h" #include "WFGraphTask.h" diff --git a/src/kernel/IOService_linux.h b/src/kernel/IOService_linux.h index 1e4f90fc..11103ea6 100644 --- a/src/kernel/IOService_linux.h +++ b/src/kernel/IOService_linux.h @@ -22,6 +22,7 @@ #include #include #include +#include #include "list.h" #define IOS_STATE_SUCCESS 0 diff --git a/src/kernel/SleepRequest.h b/src/kernel/SleepRequest.h index f2f1ed30..ffcfdf95 100644 --- a/src/kernel/SleepRequest.h +++ b/src/kernel/SleepRequest.h @@ -19,6 +19,7 @@ #ifndef _SLEEPREQUEST_H_ #define _SLEEPREQUEST_H_ +#include #include "SubTask.h" #include "Communicator.h" #include "CommScheduler.h" diff --git a/src/kernel/mpoller.h b/src/kernel/mpoller.h index b9211ff4..73e00709 100644 --- a/src/kernel/mpoller.h +++ b/src/kernel/mpoller.h @@ -19,8 +19,7 @@ #ifndef _MPOLLER_H_ #define _MPOLLER_H_ -#include -#include +#include #include "poller.h" typedef struct __mpoller mpoller_t; diff --git a/src/manager/DnsCache.h b/src/manager/DnsCache.h index 6cbf377c..c55ad159 100644 --- a/src/manager/DnsCache.h +++ b/src/manager/DnsCache.h @@ -19,8 +19,6 @@ #ifndef _DNSCACHE_H_ #define _DNSCACHE_H_ -#include -#include #include #include #include diff --git a/src/manager/RouteManager.cc b/src/manager/RouteManager.cc index 68bfac75..6fb8ca80 100644 --- a/src/manager/RouteManager.cc +++ b/src/manager/RouteManager.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include "list.h" #include "rbtree.h" #include "WFGlobal.h" -#include "WFConnection.h" #include "MD5Util.h" #include "CommScheduler.h" #include "EndpointParams.h" diff --git a/src/manager/UpstreamManager.cc b/src/manager/UpstreamManager.cc index 9ede5e69..45bcecb9 100644 --- a/src/manager/UpstreamManager.cc +++ b/src/manager/UpstreamManager.cc @@ -19,6 +19,7 @@ #include #include "UpstreamManager.h" #include "WFNameService.h" +#include "WFGlobal.h" #include "UpstreamPolicies.h" class __UpstreamManager diff --git a/src/manager/UpstreamManager.h b/src/manager/UpstreamManager.h index cccd7c3b..8b16d133 100644 --- a/src/manager/UpstreamManager.h +++ b/src/manager/UpstreamManager.h @@ -18,11 +18,9 @@ #ifndef _UPSTREAM_MANAGER_H_ #define _UPSTREAM_MANAGER_H_ + #include #include -#include -#include "URIParser.h" -#include "EndpointParams.h" #include "WFServiceGovernance.h" #include "UpstreamPolicies.h" #include "WFGlobal.h" diff --git a/src/manager/WFGlobal.cc b/src/manager/WFGlobal.cc index 079bfd33..83237943 100644 --- a/src/manager/WFGlobal.cc +++ b/src/manager/WFGlobal.cc @@ -18,13 +18,13 @@ Xie Han (xiehan@sogou-inc.com) */ -#include +#include #include +#include #include #include -#include #include -#include +#include #include #include #include @@ -35,8 +35,6 @@ #include #include #include -#include "WFGlobal.h" -#include "EndpointParams.h" #include "CommScheduler.h" #include "DnsCache.h" #include "RouteManager.h" @@ -46,6 +44,7 @@ #include "WFNameService.h" #include "WFDnsResolver.h" #include "WFDnsClient.h" +#include "WFGlobal.h" class __WFGlobal { diff --git a/src/manager/WFGlobal.h b/src/manager/WFGlobal.h index fd7d68cb..c940f597 100644 --- a/src/manager/WFGlobal.h +++ b/src/manager/WFGlobal.h @@ -26,13 +26,7 @@ #include #include -#include "CommScheduler.h" -#include "DnsCache.h" -#include "RouteManager.h" -#include "Executor.h" #include "EndpointParams.h" -#include "WFNameService.h" -#include "WFDnsResolver.h" /** * @file WFGlobal.h @@ -114,18 +108,18 @@ public: // Internal usage only public: - static CommScheduler *get_scheduler(); - static DnsCache *get_dns_cache(); - static RouteManager *get_route_manager(); + static class CommScheduler *get_scheduler(); + static class DnsCache *get_dns_cache(); + static class RouteManager *get_route_manager(); static SSL_CTX *get_ssl_client_ctx(); static SSL_CTX *new_ssl_server_ctx(); - static ExecQueue *get_exec_queue(const std::string& queue_name); - static Executor *get_compute_executor(); - static IOService *get_io_service(); - static ExecQueue *get_dns_queue(); - static Executor *get_dns_executor(); - static WFNameService *get_name_service(); - static WFDnsResolver *get_dns_resolver(); + static class ExecQueue *get_exec_queue(const std::string& queue_name); + static class Executor *get_compute_executor(); + static class IOService *get_io_service(); + static class ExecQueue *get_dns_queue(); + static class Executor *get_dns_executor(); + static class WFNameService *get_name_service(); + static class WFDnsResolver *get_dns_resolver(); static class WFDnsClient *get_dns_client(); public: diff --git a/src/nameservice/UpstreamPolicies.cc b/src/nameservice/UpstreamPolicies.cc index a660ea4a..287dd3c6 100644 --- a/src/nameservice/UpstreamPolicies.cc +++ b/src/nameservice/UpstreamPolicies.cc @@ -19,8 +19,8 @@ #include #include #include +#include "rbtree.h" #include "URIParser.h" -#include "StringUtil.h" #include "UpstreamPolicies.h" class EndpointGroup diff --git a/src/nameservice/UpstreamPolicies.h b/src/nameservice/UpstreamPolicies.h index 29b89174..2da0bca6 100644 --- a/src/nameservice/UpstreamPolicies.h +++ b/src/nameservice/UpstreamPolicies.h @@ -19,15 +19,12 @@ #ifndef _UPSTREAM_POLICIES_H_ #define _UPSTREAM_POLICIES_H_ -#include +#include #include -#include +#include #include "URIParser.h" #include "EndpointParams.h" #include "WFNameService.h" -#include "WFDnsResolver.h" -#include "WFGlobal.h" -#include "WFTaskError.h" #include "WFServiceGovernance.h" using upstream_route_t = std::function; diff --git a/src/nameservice/WFDnsResolver.cc b/src/nameservice/WFDnsResolver.cc index d5631d31..d39c279c 100644 --- a/src/nameservice/WFDnsResolver.cc +++ b/src/nameservice/WFDnsResolver.cc @@ -33,10 +33,10 @@ #include "EndpointParams.h" #include "RouteManager.h" #include "WFGlobal.h" -#include "WFTaskError.h" #include "WFTaskFactory.h" #include "WFResourcePool.h" #include "WFNameService.h" +#include "DnsCache.h" #include "DnsUtil.h" #include "WFDnsClient.h" #include "WFDnsResolver.h" diff --git a/src/nameservice/WFNameService.cc b/src/nameservice/WFNameService.cc index abeccdec..ec714142 100644 --- a/src/nameservice/WFNameService.cc +++ b/src/nameservice/WFNameService.cc @@ -18,6 +18,7 @@ #include #include +#include #include #include #include "rbtree.h" diff --git a/src/nameservice/WFServiceGovernance.cc b/src/nameservice/WFServiceGovernance.cc index f5e7e4e2..857582e7 100644 --- a/src/nameservice/WFServiceGovernance.cc +++ b/src/nameservice/WFServiceGovernance.cc @@ -17,12 +17,14 @@ */ #include +#include #include "URIParser.h" +#include "WFTaskError.h" #include "StringUtil.h" +#include "WFGlobal.h" #include "WFNameService.h" #include "WFDnsResolver.h" #include "WFServiceGovernance.h" -#include "UpstreamManager.h" #define GET_CURRENT_SECOND std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()).count() diff --git a/src/nameservice/WFServiceGovernance.h b/src/nameservice/WFServiceGovernance.h index b294577f..942cf2f5 100644 --- a/src/nameservice/WFServiceGovernance.h +++ b/src/nameservice/WFServiceGovernance.h @@ -26,9 +26,6 @@ #include "URIParser.h" #include "EndpointParams.h" #include "WFNameService.h" -#include "WFDnsResolver.h" -#include "WFGlobal.h" -#include "WFTaskError.h" #define MTTR_SECOND_DEFAULT 30 #define VIRTUAL_GROUP_SIZE 16 diff --git a/src/protocol/DnsUtil.h b/src/protocol/DnsUtil.h index 2647885a..2d49dbc0 100644 --- a/src/protocol/DnsUtil.h +++ b/src/protocol/DnsUtil.h @@ -19,6 +19,7 @@ #ifndef _DNSUTIL_H_ #define _DNSUTIL_H_ +#include #include "DnsMessage.h" /** diff --git a/src/protocol/HttpUtil.cc b/src/protocol/HttpUtil.cc index c5ff6266..c6113bbb 100644 --- a/src/protocol/HttpUtil.cc +++ b/src/protocol/HttpUtil.cc @@ -20,9 +20,9 @@ #include #include #include -#include "HttpUtil.h" -#include "URIParser.h" #include "http_parser.h" +#include "HttpMessage.h" +#include "HttpUtil.h" namespace protocol { diff --git a/src/protocol/HttpUtil.h b/src/protocol/HttpUtil.h index c2c28ecc..b5c36b51 100644 --- a/src/protocol/HttpUtil.h +++ b/src/protocol/HttpUtil.h @@ -23,8 +23,8 @@ #include #include #include -#include "HttpMessage.h" #include "http_parser.h" +#include "HttpMessage.h" /** * @file HttpUtil.h diff --git a/src/protocol/KafkaMessage.cc b/src/protocol/KafkaMessage.cc index c86d0c2e..e568e2b6 100644 --- a/src/protocol/KafkaMessage.cc +++ b/src/protocol/KafkaMessage.cc @@ -35,6 +35,7 @@ #include #include #include "crc32c.h" +#include "EncodeStream.h" #include "KafkaMessage.h" namespace protocol diff --git a/src/protocol/KafkaMessage.h b/src/protocol/KafkaMessage.h index 2978fa25..ed670558 100644 --- a/src/protocol/KafkaMessage.h +++ b/src/protocol/KafkaMessage.h @@ -27,7 +27,6 @@ #include #include "kafka_parser.h" #include "ProtocolMessage.h" -#include "EncodeStream.h" #include "KafkaDataTypes.h" @@ -184,7 +183,7 @@ protected: using parse_func = std::function; std::map parse_func_map; - EncodeStream *stream; + class EncodeStream *stream; std::string msgbuf; std::string headbuf; diff --git a/src/protocol/MySQLMessage.cc b/src/protocol/MySQLMessage.cc index 152f3520..c407c2e3 100644 --- a/src/protocol/MySQLMessage.cc +++ b/src/protocol/MySQLMessage.cc @@ -26,6 +26,7 @@ #include #include #include "SSLWrapper.h" +#include "mysql_byteorder.h" #include "mysql_types.h" #include "MySQLResult.h" #include "MySQLMessage.h" diff --git a/src/protocol/MySQLMessage.h b/src/protocol/MySQLMessage.h index 5541a28f..866209e5 100644 --- a/src/protocol/MySQLMessage.h +++ b/src/protocol/MySQLMessage.h @@ -24,7 +24,6 @@ #include "ProtocolMessage.h" #include "mysql_stream.h" #include "mysql_parser.h" -#include "mysql_byteorder.h" /** * @file MySQLMessage.h diff --git a/src/protocol/MySQLMessage.inl b/src/protocol/MySQLMessage.inl index 166c891c..4e0cf553 100644 --- a/src/protocol/MySQLMessage.inl +++ b/src/protocol/MySQLMessage.inl @@ -22,7 +22,6 @@ #include #include #include "SSLWrapper.h" -#include "mysql_byteorder.h" namespace protocol { diff --git a/src/protocol/MySQLResult.cc b/src/protocol/MySQLResult.cc index 4764f9d2..7bbeead0 100644 --- a/src/protocol/MySQLResult.cc +++ b/src/protocol/MySQLResult.cc @@ -16,8 +16,10 @@ Authors: Li Yingxin (liyingxin@sogou-inc.com) */ +#include #include "mysql_types.h" #include "mysql_byteorder.h" +#include "MySQLMessage.h" #include "MySQLResult.h" namespace protocol diff --git a/src/protocol/MySQLResult.h b/src/protocol/MySQLResult.h index d3de3c37..c81825ec 100644 --- a/src/protocol/MySQLResult.h +++ b/src/protocol/MySQLResult.h @@ -23,8 +23,9 @@ #include #include #include -#include "MySQLMessage.h" #include "mysql_types.h" +#include "mysql_parser.h" +#include "MySQLMessage.h" /** * @file MySQLResult.h diff --git a/src/protocol/RedisMessage.cc b/src/protocol/RedisMessage.cc index de0bd88f..60e0ffbe 100644 --- a/src/protocol/RedisMessage.cc +++ b/src/protocol/RedisMessage.cc @@ -18,10 +18,10 @@ */ #include -#include #include #include #include +#include "EncodeStream.h" #include "RedisMessage.h" namespace protocol diff --git a/src/protocol/RedisMessage.h b/src/protocol/RedisMessage.h index 1426ed12..043acc0a 100644 --- a/src/protocol/RedisMessage.h +++ b/src/protocol/RedisMessage.h @@ -24,7 +24,6 @@ #include #include #include "ProtocolMessage.h" -#include "EncodeStream.h" #include "redis_parser.h" /** @@ -141,7 +140,7 @@ protected: virtual int append(const void *buf, size_t *size); bool encode_reply(redis_reply_t *reply); - EncodeStream *stream_; + class EncodeStream *stream_; private: size_t cur_size_; diff --git a/src/protocol/http_parser.c b/src/protocol/http_parser.c index a537d6b3..80a7dd94 100644 --- a/src/protocol/http_parser.c +++ b/src/protocol/http_parser.c @@ -17,7 +17,6 @@ */ #include -#include #include #include "list.h" #include "http_parser.h" diff --git a/src/protocol/mysql_parser.c b/src/protocol/mysql_parser.c index 187a4c21..258e2494 100644 --- a/src/protocol/mysql_parser.c +++ b/src/protocol/mysql_parser.c @@ -16,6 +16,7 @@ Authors: Li Yingxin (liyingxin@sogou-inc.com) */ +#include #include "mysql_types.h" #include "mysql_byteorder.h" #include "mysql_parser.h" diff --git a/src/protocol/mysql_parser.h b/src/protocol/mysql_parser.h index ba92ecac..faf39e26 100644 --- a/src/protocol/mysql_parser.h +++ b/src/protocol/mysql_parser.h @@ -19,7 +19,7 @@ #ifndef _MYSQL_PARSER_H_ #define _MYSQL_PARSER_H_ -#include +#include #include "list.h" // the first byte in response message diff --git a/src/protocol/redis_parser.c b/src/protocol/redis_parser.c index f48e9a86..54e82097 100644 --- a/src/protocol/redis_parser.c +++ b/src/protocol/redis_parser.c @@ -16,8 +16,8 @@ Authors: Wu Jiaxu (wujiaxu@sogou-inc.com) */ -#include #include +#include #include "list.h" #include "redis_parser.h" diff --git a/src/protocol/redis_parser.h b/src/protocol/redis_parser.h index da746dbb..dcb6cf49 100644 --- a/src/protocol/redis_parser.h +++ b/src/protocol/redis_parser.h @@ -19,6 +19,7 @@ #ifndef _REDIS_PARSER_H_ #define _REDIS_PARSER_H_ +#include #include "list.h" // redis_parser_t is absolutely same as hiredis-redisReply in memory @@ -121,3 +122,4 @@ static inline void redis_reply_set_status(const char *str, size_t len, } #endif + diff --git a/src/server/WFMySQLServer.cc b/src/server/WFMySQLServer.cc index c1b747c1..012efa46 100644 --- a/src/server/WFMySQLServer.cc +++ b/src/server/WFMySQLServer.cc @@ -16,6 +16,7 @@ Authors: Wu Jiaxu (wujiaxu@sogou-inc.com) */ +#include #include "WFMySQLServer.h" WFConnection *WFMySQLServer::new_connection(int accept_fd) diff --git a/src/server/WFServer.h b/src/server/WFServer.h index 41cb5590..6cebc7a3 100644 --- a/src/server/WFServer.h +++ b/src/server/WFServer.h @@ -27,7 +27,6 @@ #include #include #include -#include "CommScheduler.h" #include "WFTaskFactory.h" struct WFServerParams @@ -179,7 +178,7 @@ private: std::mutex mutex; std::condition_variable cond; - CommScheduler *scheduler; + class CommScheduler *scheduler; }; template diff --git a/src/util/EncodeStream.cc b/src/util/EncodeStream.cc index fa01f91c..b512567d 100644 --- a/src/util/EncodeStream.cc +++ b/src/util/EncodeStream.cc @@ -16,8 +16,8 @@ Authors: Wu Jiaxu (wujiaxu@sogou-inc.com) */ -#include -#include +#include +#include #include "list.h" #include "EncodeStream.h" diff --git a/src/util/LRUCache.h b/src/util/LRUCache.h index ad237ce9..ae4f8026 100644 --- a/src/util/LRUCache.h +++ b/src/util/LRUCache.h @@ -90,7 +90,7 @@ typedef typename Map::const_iterator MapConstIterator; public: LRUCache(): - max_size_(0), + max_size_(1), size_(0) { not_use_.next = ¬_use_; diff --git a/src/util/MD5Util.cc b/src/util/MD5Util.cc index a058d846..9deeb33a 100644 --- a/src/util/MD5Util.cc +++ b/src/util/MD5Util.cc @@ -17,8 +17,8 @@ */ #include -#include #include +#include #include "MD5Util.h" static inline void __md5(const std::string& str, unsigned char *md) diff --git a/src/util/StringUtil.cc b/src/util/StringUtil.cc index 7a9c829a..5bcf1efb 100644 --- a/src/util/StringUtil.cc +++ b/src/util/StringUtil.cc @@ -17,6 +17,8 @@ */ #include +#include +#include #include #include "StringUtil.h" diff --git a/src/util/StringUtil.h b/src/util/StringUtil.h index d37133f7..2a0d5a39 100644 --- a/src/util/StringUtil.h +++ b/src/util/StringUtil.h @@ -18,6 +18,7 @@ #ifndef _STRINGUTIL_H_ #define _STRINGUTIL_H_ + #include #include diff --git a/src/util/URIParser.cc b/src/util/URIParser.cc index 29c7a2ec..704f5e11 100644 --- a/src/util/URIParser.cc +++ b/src/util/URIParser.cc @@ -19,9 +19,10 @@ */ #include -#include #include #include +#include +#include #include "StringUtil.h" #include "URIParser.h" diff --git a/tutorial/tutorial-05-http_proxy.cc b/tutorial/tutorial-05-http_proxy.cc index f483db6d..ad865f45 100644 --- a/tutorial/tutorial-05-http_proxy.cc +++ b/tutorial/tutorial-05-http_proxy.cc @@ -119,7 +119,7 @@ void process(WFHttpTask *proxy_task) }); context->is_keep_alive = req->is_keep_alive(); - http_task = WFTaskFactory::create_http_task(req->get_request_uri(), 0, 0, + http_task = WFTaskFactory::create_http_task(req->get_request_uri(), 3, 2, http_callback); const void *body; @@ -158,6 +158,8 @@ int main(int argc, char *argv[]) signal(SIGINT, sig_handler); struct WFGlobalSettings settings = GLOBAL_SETTINGS_DEFAULT; + settings.dns_ttl_default = 10; + settings.dns_ttl_min = 5; settings.resolv_conf_path = "/etc/resolv.conf"; settings.hosts_path = "/etc/hosts"; WORKFLOW_library_init(&settings);