Fix 'include' errors

2026-02-08 01:33:17 +08:00 · 2021-10-04 00:43:03 +08:00
parent b1db18cd39
commit 7cac784725
46 changed files with 62 additions and 67 deletions
--- a/src/algorithm/DnsRoutine.h
+++ b/src/algorithm/DnsRoutine.h
@@ -18,8 +18,7 @@

 #ifndef _DNSROUTINE_H_
 #define _DNSROUTINE_H_
-#include <sys/types.h>
-#include <sys/socket.h>
+
 #include <netdb.h>
 #include <string>

--- a/src/algorithm/MapReduce.h
+++ b/src/algorithm/MapReduce.h
@@ -22,7 +22,6 @@
 #include <utility>
 #include <vector>
 #include <functional>
-#include <type_traits>
 #include "rbtree.h"

 namespace algorithm
--- a/src/factory/HttpTaskImpl.cc
+++ b/src/factory/HttpTaskImpl.cc
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include <string>
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
--- a/src/factory/WFTaskFactory.cc
+++ b/src/factory/WFTaskFactory.cc
@@ -18,6 +18,7 @@
 */

 #include <sys/types.h>
+#include <time.h>
 #include <string>
 #include <mutex>
 #include "list.h"
--- 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"
--- a/src/kernel/IOService_linux.h
+++ b/src/kernel/IOService_linux.h
@@ -22,6 +22,7 @@
 #include <sys/uio.h>
 #include <sys/eventfd.h>
 #include <stddef.h>
+#include <pthread.h>
 #include "list.h"

 #define IOS_STATE_SUCCESS	0
--- a/src/kernel/SleepRequest.h
+++ b/src/kernel/SleepRequest.h
@@ -19,6 +19,7 @@
 #ifndef _SLEEPREQUEST_H_
 #define _SLEEPREQUEST_H_

+#include <errno.h>
 #include "SubTask.h"
 #include "Communicator.h"
 #include "CommScheduler.h"
--- a/src/kernel/mpoller.h
+++ b/src/kernel/mpoller.h
@@ -19,8 +19,7 @@
 #ifndef _MPOLLER_H_
 #define _MPOLLER_H_

-#include <sys/types.h>
-#include <sys/socket.h>
+#include <stddef.h>
 #include "poller.h"

 typedef struct __mpoller mpoller_t;
--- a/src/manager/DnsCache.h
+++ b/src/manager/DnsCache.h
@@ -19,8 +19,6 @@
 #ifndef _DNSCACHE_H_
 #define _DNSCACHE_H_

-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netdb.h>
 #include <stdint.h>
 #include <string>
--- a/src/manager/RouteManager.cc
+++ b/src/manager/RouteManager.cc
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
@@ -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"
--- a/src/manager/UpstreamManager.cc
+++ b/src/manager/UpstreamManager.cc
@@ -19,6 +19,7 @@
 #include <pthread.h>
 #include "UpstreamManager.h"
 #include "WFNameService.h"
+#include "WFGlobal.h"
 #include "UpstreamPolicies.h"

 class __UpstreamManager
--- a/src/manager/UpstreamManager.h
+++ b/src/manager/UpstreamManager.h
@@ -18,11 +18,9 @@

 #ifndef _UPSTREAM_MANAGER_H_
 #define _UPSTREAM_MANAGER_H_
+
 #include <string>
 #include <vector>
-#include <functional>
-#include "URIParser.h"
-#include "EndpointParams.h"
 #include "WFServiceGovernance.h"
 #include "UpstreamPolicies.h"
 #include "WFGlobal.h"
--- a/src/manager/WFGlobal.cc
+++ b/src/manager/WFGlobal.cc
@@ -18,13 +18,13 @@
           Xie Han (xiehan@sogou-inc.com)
 */

-#include <assert.h>
+#include <arpa/inet.h>
 #include <unistd.h>
+#include <assert.h>
 #include <signal.h>
 #include <pthread.h>
-#include <string.h>
 #include <stdio.h>
-#include <arpa/inet.h>
+#include <ctype.h>
 #include <string>
 #include <unordered_map>
 #include <atomic>
@@ -35,8 +35,6 @@
 #include <openssl/engine.h>
 #include <openssl/conf.h>
 #include <openssl/crypto.h>
-#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
 {
--- a/src/manager/WFGlobal.h
+++ b/src/manager/WFGlobal.h
@@ -26,13 +26,7 @@

 #include <string>
 #include <openssl/ssl.h>
-#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:
--- a/src/nameservice/UpstreamPolicies.cc
+++ b/src/nameservice/UpstreamPolicies.cc
@@ -19,8 +19,8 @@
 #include <pthread.h>
 #include <algorithm>
 #include <random>
+#include "rbtree.h"
 #include "URIParser.h"
-#include "StringUtil.h"
 #include "UpstreamPolicies.h"

 class EndpointGroup
--- a/src/nameservice/UpstreamPolicies.h
+++ b/src/nameservice/UpstreamPolicies.h
@@ -19,15 +19,12 @@
 #ifndef _UPSTREAM_POLICIES_H_
 #define _UPSTREAM_POLICIES_H_

-#include <pthread.h>
+#include <utility>
 #include <vector>
-#include <atomic>
+#include <functional>
 #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<unsigned int (const char *, const char *, const char *)>;
--- 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"
--- a/src/nameservice/WFNameService.cc
+++ b/src/nameservice/WFNameService.cc
@@ -18,6 +18,7 @@

 #include <errno.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
 #include "rbtree.h"
--- a/src/nameservice/WFServiceGovernance.cc
+++ b/src/nameservice/WFServiceGovernance.cc
@@ -17,12 +17,14 @@
 */

 #include <vector>
+#include <chrono>
 #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::seconds>(std::chrono::steady_clock::now().time_since_epoch()).count()

--- 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
--- a/src/protocol/DnsUtil.h
+++ b/src/protocol/DnsUtil.h
@@ -19,6 +19,7 @@
 #ifndef _DNSUTIL_H_
 #define _DNSUTIL_H_

+#include <netdb.h>
 #include "DnsMessage.h"

 /**
--- a/src/protocol/HttpUtil.cc
+++ b/src/protocol/HttpUtil.cc
@@ -20,9 +20,9 @@
 #include <string>
 #include <vector>
 #include <algorithm>
-#include "HttpUtil.h"
-#include "URIParser.h"
 #include "http_parser.h"
+#include "HttpMessage.h"
+#include "HttpUtil.h"

 namespace protocol
 {
--- a/src/protocol/HttpUtil.h
+++ b/src/protocol/HttpUtil.h
@@ -23,8 +23,8 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
-#include "HttpMessage.h"
 #include "http_parser.h"
+#include "HttpMessage.h"

 /**
 * @file   HttpUtil.h
--- a/src/protocol/KafkaMessage.cc
+++ b/src/protocol/KafkaMessage.cc
@@ -35,6 +35,7 @@
 #include <snappy.h>
 #include <snappy-sinksource.h>
 #include "crc32c.h"
+#include "EncodeStream.h"
 #include "KafkaMessage.h"

 namespace protocol
--- a/src/protocol/KafkaMessage.h
+++ b/src/protocol/KafkaMessage.h
@@ -27,7 +27,6 @@
 #include <functional>
 #include "kafka_parser.h"
 #include "ProtocolMessage.h"
-#include "EncodeStream.h"
 #include "KafkaDataTypes.h"


@@ -184,7 +183,7 @@ protected:
 	using parse_func = std::function<int (void **buf, size_t *size)>;
 	std::map<int, parse_func> parse_func_map;

-	EncodeStream *stream;
+	class EncodeStream *stream;
 	std::string msgbuf;
 	std::string headbuf;

--- a/src/protocol/MySQLMessage.cc
+++ b/src/protocol/MySQLMessage.cc
@@ -26,6 +26,7 @@
 #include <openssl/sha.h>
 #include <utility>
 #include "SSLWrapper.h"
+#include "mysql_byteorder.h"
 #include "mysql_types.h"
 #include "MySQLResult.h"
 #include "MySQLMessage.h"
--- 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
--- a/src/protocol/MySQLMessage.inl
+++ b/src/protocol/MySQLMessage.inl
@@ -22,7 +22,6 @@
 #include <string>
 #include <openssl/ssl.h>
 #include "SSLWrapper.h"
-#include "mysql_byteorder.h"

 namespace protocol
 {
--- a/src/protocol/MySQLResult.cc
+++ b/src/protocol/MySQLResult.cc
@@ -16,8 +16,10 @@
  Authors: Li Yingxin (liyingxin@sogou-inc.com)
 */

+#include <vector>
 #include "mysql_types.h"
 #include "mysql_byteorder.h"
+#include "MySQLMessage.h"
 #include "MySQLResult.h"

 namespace protocol
--- a/src/protocol/MySQLResult.h
+++ b/src/protocol/MySQLResult.h
@@ -23,8 +23,9 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
-#include "MySQLMessage.h"
 #include "mysql_types.h"
+#include "mysql_parser.h"
+#include "MySQLMessage.h"

 /**
 * @file   MySQLResult.h
--- a/src/protocol/RedisMessage.cc
+++ b/src/protocol/RedisMessage.cc
@@ -18,10 +18,10 @@
 */

 #include <errno.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sstream>
 #include <utility>
+#include "EncodeStream.h"
 #include "RedisMessage.h"

 namespace protocol
--- a/src/protocol/RedisMessage.h
+++ b/src/protocol/RedisMessage.h
@@ -24,7 +24,6 @@
 #include <string>
 #include <vector>
 #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_;
--- a/src/protocol/http_parser.c
+++ b/src/protocol/http_parser.c
@@ -17,7 +17,6 @@
 */

 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include "list.h"
 #include "http_parser.h"
--- a/src/protocol/mysql_parser.c
+++ b/src/protocol/mysql_parser.c
@@ -16,6 +16,7 @@
  Authors: Li Yingxin (liyingxin@sogou-inc.com)
 */

+#include <stdlib.h>
 #include "mysql_types.h"
 #include "mysql_byteorder.h"
 #include "mysql_parser.h"
--- 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 <stdlib.h>
+#include <stddef.h>
 #include "list.h"

 // the first byte in response message
--- a/src/protocol/redis_parser.c
+++ b/src/protocol/redis_parser.c
@@ -16,8 +16,8 @@
  Authors: Wu Jiaxu (wujiaxu@sogou-inc.com)
 */

-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include "list.h"
 #include "redis_parser.h"

--- 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 <stddef.h>
 #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
+
--- a/src/server/WFMySQLServer.cc
+++ b/src/server/WFMySQLServer.cc
@@ -16,6 +16,7 @@
  Authors: Wu Jiaxu (wujiaxu@sogou-inc.com)
 */

+#include <sys/uio.h>
 #include "WFMySQLServer.h"

 WFConnection *WFMySQLServer::new_connection(int accept_fd)
--- a/src/server/WFServer.h
+++ b/src/server/WFServer.h
@@ -27,7 +27,6 @@
 #include <atomic>
 #include <mutex>
 #include <condition_variable>
-#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<class REQ, class RESP>
--- a/src/util/EncodeStream.cc
+++ b/src/util/EncodeStream.cc
@@ -16,8 +16,8 @@
  Authors: Wu Jiaxu (wujiaxu@sogou-inc.com)
 */

-#include <stdio.h>
-#include <string.h>
+#include <stddef.h>
+#include <string>
 #include "list.h"
 #include "EncodeStream.h"

--- 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 = &not_use_;
--- a/src/util/MD5Util.cc
+++ b/src/util/MD5Util.cc
@@ -17,8 +17,8 @@
 */

 #include <openssl/md5.h>
-#include <stdio.h>
 #include <string.h>
+#include <string>
 #include "MD5Util.h"

 static inline void __md5(const std::string& str, unsigned char *md)
--- a/src/util/StringUtil.cc
+++ b/src/util/StringUtil.cc
@@ -17,6 +17,8 @@
 */

 #include <ctype.h>
+#include <string>
+#include <vector>
 #include <algorithm>
 #include "StringUtil.h"

--- a/src/util/StringUtil.h
+++ b/src/util/StringUtil.h
@@ -18,6 +18,7 @@

 #ifndef _STRINGUTIL_H_
 #define _STRINGUTIL_H_
+
 #include <string>
 #include <vector>

--- a/src/util/URIParser.cc
+++ b/src/util/URIParser.cc
@@ -19,9 +19,10 @@
 */

 #include <string.h>
-#include <ctype.h>
 #include <errno.h>
 #include <utility>
+#include <vector>
+#include <map>
 #include "StringUtil.h"
 #include "URIParser.h"

--- 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);