Merge branch 'dev_tcp_client_chengxin' into 'feature_tcp_client'

【ENH】优化代码，更好的兼容x64配置

See merge request server/openapi/openapi-cpp-sdk!24

Author: Cheng Xin

include/tigerapi/push_socket/push_frame_serialize.h

@@ -18,12 +18,12 @@ namespace TIGER_API
 		~PushFrameDecoder() = default;
 
 		bool push_byte(unsigned char value);
-		uint64_t get_frame_size() const;
+		uint32_t get_frame_size() const;
 
 	private:
-		uint64_t decode_varint();
+		uint32_t decode_varint();
 		std::vector<unsigned char> frame_header_buffer_;
-		uint64_t frame_len_ = 0;
+		uint32_t frame_len_ = 0;
 	};
 
 }

include/tigerapi/push_socket/push_socket.h

@@ -44,7 +44,7 @@ namespace TIGER_API
 		void connect();
 		void disconnect();
 		bool send_message(const std::string& msg);
-		uint32_t get_next_id();
+		unsigned int get_next_id();
 	private:
 		void init_socket();
 		bool verify_certificate(bool preverified,
@@ -60,14 +60,14 @@ namespace TIGER_API
 		void handle_handshake(const boost::system::error_code& error);
 		void handle_write(const boost::system::error_code& error,
 			size_t bytes_transferred,
-			unsigned int frame_len);
+			size_t frame_len);
 		void handle_read_head(const boost::system::error_code& error,
 			size_t bytes_transferred);
 		void handle_read_body(const boost::system::error_code& error,
 			size_t bytes_transferred,
 			char* recv_buff,
 			int page_num,
-			unsigned int frame_len);
+			size_t frame_len);
 		void handle_timer(const boost::system::error_code& error);
 
 		void read_head();
@@ -92,7 +92,7 @@ namespace TIGER_API
 		std::shared_ptr<boost::asio::deadline_timer> reconnect_timer_;
 		std::atomic<SocketState> socket_state_ = SocketState::DISCONNECTED;
 
-		std::atomic<uint32_t> id_counter_ = 0;
+		std::atomic<unsigned int> id_counter_ = 0;
 
 		char head_buff_[1024];
 		boost::shared_ptr<boost::pool<>> recv_buff_pool_;

src/push_socket/push_frame_serialize.cpp

@@ -1,5 +1,4 @@
 #include "tigerapi/push_socket/push_frame_serialize.h"
-#include <boost/endian/conversion.hpp>
 
 std::vector<unsigned char> TIGER_API::PushFrameEncoder::encode_frame(const std::string& packed_frame)
 {
@@ -16,20 +15,20 @@ std::vector<unsigned char> TIGER_API::PushFrameEncoder::encode_frame(const std::
 	while (pack_size) 
 	{
 		unsigned char header_byte = 0x80 | bits;
-		pack_array.push_back(/*boost::endian::native_to_big(header_byte)*/header_byte);
+		pack_array.push_back(header_byte);
 		bits = pack_size & 0x7F;
 		pack_size >>= 7;
 	}
 
-	pack_array.push_back(/*boost::endian::native_to_big(bits)*/bits);
+	pack_array.push_back(bits);
 	pack_array.insert(pack_array.end(), packed_frame.begin(), packed_frame.end());
 	return pack_array;
 }
 
 bool TIGER_API::PushFrameDecoder::push_byte(unsigned char value)
 {
-	//逐个字节压入缓冲区(使用大端序列)
-	frame_header_buffer_.push_back(/*boost::endian::native_to_big(value)*/value);
+	//逐个字节压入缓冲区
+	frame_header_buffer_.push_back(value);
 	if (!(value & 0x80))
 	{
 		//完整读取到包长度
@@ -42,12 +41,12 @@ bool TIGER_API::PushFrameDecoder::push_byte(unsigned char value)
 	return false;
 }
 
-uint64_t TIGER_API::PushFrameDecoder::get_frame_size() const
+uint32_t TIGER_API::PushFrameDecoder::get_frame_size() const
 {
 	return frame_len_;
 }
 
-uint64_t TIGER_API::PushFrameDecoder::decode_varint()
+uint32_t TIGER_API::PushFrameDecoder::decode_varint()
 {
 	const uint32_t mask = (1U << 32) - 1;  // 32位掩码
 	uint32_t result = 0;

src/push_socket/push_socket.cpp

@@ -159,7 +159,7 @@ bool TIGER_API::PushSocket::verify_certificate(bool preverified, boost::asio::ss
 	return preverified;
 }
 
-uint32_t TIGER_API::PushSocket::get_next_id()
+unsigned int TIGER_API::PushSocket::get_next_id()
 {
 	return ++id_counter_;
 }
@@ -374,7 +374,7 @@ void TIGER_API::PushSocket::handle_handshake(const boost::system::error_code& er
 
 void TIGER_API::PushSocket::handle_write(const boost::system::error_code& error,
 	size_t bytes_transferred,
-	unsigned int frame_len)
+	size_t frame_len)
 {
 	if (error || frame_len != bytes_transferred)
 	{
@@ -422,7 +422,7 @@ void TIGER_API::PushSocket::handle_read_body(const boost::system::error_code& er
 	size_t bytes_transferred,
 	char* recv_buff,
 	int page_num,
-	unsigned int frame_len)
+	size_t frame_len)
 {
 	if (error || 0 == bytes_transferred || bytes_transferred != frame_len)
 	{
@@ -508,7 +508,7 @@ void TIGER_API::PushSocket::read_head()
 
 void TIGER_API::PushSocket::read_body(size_t frame_len)
 {
-	unsigned int page_num = frame_len / MEMORY_POOL_PAGE_SIZE + 1;
+	size_t page_num = frame_len / MEMORY_POOL_PAGE_SIZE + 1;
 
 	char* recv_buff = (char*)recv_buff_pool_->ordered_malloc(page_num);
 	if (!recv_buff)