UltraMonkey-L7 V3(multi-thread implementation)
Revision | 17126b3c06102a6682eec4184480e4160796586c (tree) |
---|---|
Time | 2012-07-31 11:31:30 |
Author | Hiroaki Nakano <nakano.hiroaki@nttc...> |
Commiter | Hiroaki Nakano |
Merge branch '1a0320df21c18f7fe764c9e2c0e59f4810e26073' into v3.0.4-devel
@@ -144,7 +144,6 @@ protected: | ||
144 | 144 | UP_FUNC_CLIENT_DISCONNECT, //! up_thread_client_disconnect function |
145 | 145 | UP_FUNC_CLIENT_DISCONNECT_EVENT, //! up_thread_client_disconnect_event function |
146 | 146 | UP_FUNC_CLIENT_RECEIVE, //! up_thread_client_receive function |
147 | - UP_FUNC_CLIENT_ARECEIVE_HANDLE_EVENT, //! up_thread_client_asnc_read_some_handler function | |
148 | 147 | UP_FUNC_CLIENT_HANDLE_ARECIEVE, //! up_thread_client_handle_async_read_some function |
149 | 148 | UP_FUNC_CLIENT_RESPOND_SEND, //! up_thread_client_respond function |
150 | 149 | UP_FUNC_CLIENT_RESPOND_SEND_EVENT, //! up_thread_client_respond_event function |
@@ -153,8 +152,7 @@ protected: | ||
153 | 152 | UP_FUNC_REALSERVER_CONNECT_EVENT, //! up_thread_realserver_connect_event function |
154 | 153 | UP_FUNC_REALSERVER_CONNECT_FAIL_EVENT, //! up_thread_realserver_connection_fail_event function |
155 | 154 | UP_FUNC_REALSERVER_SEND, //! up_thread_realserver_send function |
156 | - UP_FUNC_REALSERVER_ASEND_HANDLE_EVENT, //! up_thread_realserver_async_write_some_handler function | |
157 | - UP_FUNC_REALSERVER_HANDLE_ASEND, //! up_thread_realserver_handle_async_write_some function | |
155 | + UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND, //! up_thread_realserver_handle_async_write_some function | |
158 | 156 | UP_FUNC_REALSERVER_DISCONNECT, //! up_thread_realserver_disconnect function |
159 | 157 | UP_FUNC_REALSERVER_DISCONNECT_EVENT, //! up_thread_realserver_disconnect_event function |
160 | 158 | UP_FUNC_REALSERVER_ALL_DISCONNECT, //! up_thread_realserver_asll_disconnect function |
@@ -164,8 +162,7 @@ protected: | ||
164 | 162 | UP_FUNC_SORRYSERVER_CONNECT_EVENT, //! up_thread_sorryserver_connect_event function |
165 | 163 | UP_FUNC_SORRYSERVER_CONNECT_FAIL_EVENT, //! up_thread_sorryserver_connection_fail_event function |
166 | 164 | UP_FUNC_SORRYSERVER_SEND, //! up_thread_sorryserver_send function |
167 | - UP_FUNC_SORRYSERVER_ASEND_HANDLE_EVENT, //! up_thread_sorryserver_async_read_some_handler function | |
168 | - UP_FUNC_SORRYSERVER_HANDLE_ASEND, //! up_thread_sorryserver_handle_async_read_some function | |
165 | + UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND, //! up_thread_sorryserver_handle_async_read_some function | |
169 | 166 | UP_FUNC_SORRYSERVER_DISCONNECT, //! up_thread_sorryserver_disconnect function |
170 | 167 | UP_FUNC_SORRYSERVER_MOD_DISCONNECT, //! up_thread_sorryserver_mod_disconnect function |
171 | 168 | UP_FUNC_SORRYSERVER_DISCONNECT_EVENT, //! up_thread_sorryserver_disconnect_event function |
@@ -184,18 +181,15 @@ protected: | ||
184 | 181 | DOWN_FUNC_CLIENT_DISCONNECT_EVENT, //! down_thread_client_disconnect_event function |
185 | 182 | DOWN_FUNC_CLIENT_CONNECTION_CHK, //! down_thread_client_connection_chk_event function |
186 | 183 | DOWN_FUNC_CLIENT_SEND, //! down_thread_client_send function |
187 | - DOWN_FUNC_CLIENT_ASEND_HANDLE_EVENT, //! down_thread_client_async_write_some_handler function | |
188 | - DOWN_FUNC_CLIENT_HANDLE_ASEND, //! down_thread_client_handle_async_write_some function | |
184 | + DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND, //! down_thread_client_handle_async_write_some function | |
189 | 185 | DOWN_FUNC_CLIENT_RESPOND_SEND_EVENT, //! down_thread_client_respond_event function |
190 | 186 | DOWN_FUNC_REALSERVER_RECEIVE, //! down_thread_realserver_receive function |
191 | - DOWN_FUNC_REALSERVER_ARECEIVE_HANDLE_EVENT, //! down_thread_realserver_async_read_some_handler function | |
192 | - DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE, //! down_thread_realserver_handle_async_read_some function | |
187 | + DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE, //! down_thread_realserver_handle_async_read_some function | |
193 | 188 | DOWN_FUNC_REALSERVER_DISCONNECT, //! down_thread_realserver_disconnect function |
194 | 189 | DOWN_FUNC_REALSERVER_DISCONNECT_EVENT, //! down_thread_realserver_disconnect_event function |
195 | 190 | DOWN_FUNC_REALSERVER_ALL_DISCONNECT, //! down_thread_all_realserver_disconnect function |
196 | 191 | DOWN_FUNC_SORRYSERVER_RECEIVE, //! down_thread_sorryserver_receive function |
197 | - DOWN_FUNC_SORRYSERVER_ARECEIVE_HANDLE_EVENT, //! down_thread_sorryserver_async_read_some_handler function | |
198 | - DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE, //! down_thread_sorryserver_handle_async_read_some function | |
192 | + DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE, //! down_thread_sorryserver_handle_async_read_some function | |
199 | 193 | DOWN_FUNC_SORRYSERVER_DISCONNECT, //! down_thread_sorryserver_disconnect function |
200 | 194 | DOWN_FUNC_SORRYSERVER_MOD_DISCONNECT, //! down_thread_sorryserver_mod_disconnect function |
201 | 195 | DOWN_FUNC_SORRYSERVER_DISCONNECT_EVENT, //! down_thread_sorryserver_disconnect_event function |
@@ -633,7 +627,6 @@ protected: | ||
633 | 627 | : in == UP_FUNC_CLIENT_DISCONNECT ? "UP_FUNC_CLIENT_DISCONNECT" |
634 | 628 | : in == UP_FUNC_CLIENT_DISCONNECT_EVENT ? "UP_FUNC_CLIENT_DISCONNECT_EVENT" |
635 | 629 | : in == UP_FUNC_CLIENT_RECEIVE ? "UP_FUNC_CLIENT_RECEIVE" |
636 | - : in == UP_FUNC_CLIENT_ARECEIVE_HANDLE_EVENT ? "UP_FUNC_CLIENT_ARECIEVE_HANDLE_EVENT" | |
637 | 630 | : in == UP_FUNC_CLIENT_HANDLE_ARECIEVE ? "UP_FUNC_CLIENT_HANDLE_ARECIEVE" |
638 | 631 | : in == UP_FUNC_CLIENT_RESPOND_SEND ? "UP_FUNC_CLIENT_RESPOND_SEND" |
639 | 632 | : in == UP_FUNC_CLIENT_RESPOND_SEND_EVENT ? "UP_FUNC_CLIENT_RESPOND_SEND_EVENT" |
@@ -642,8 +635,7 @@ protected: | ||
642 | 635 | : in == UP_FUNC_REALSERVER_CONNECT_EVENT ? "UP_FUNC_REALSERVER_CONNECT_EVENT" |
643 | 636 | : in == UP_FUNC_REALSERVER_CONNECT_FAIL_EVENT ? "UP_FUNC_REALSERVER_CONNECT_FAIL_EVENT" |
644 | 637 | : in == UP_FUNC_REALSERVER_SEND ? "UP_FUNC_REALSERVER_SEND" |
645 | - : in == UP_FUNC_REALSERVER_ASEND_HANDLE_EVENT ? "UP_FUNC_REALSERVER_ASEND_HANDLE_EVENT" | |
646 | - : in == UP_FUNC_REALSERVER_HANDLE_ASEND ? "UP_FUNC_REALSERVER_HANDLE_ASEND" | |
638 | + : in == UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND ? "UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND" | |
647 | 639 | : in == UP_FUNC_REALSERVER_DISCONNECT ? "UP_FUNC_REALSERVER_DISCONNECT" |
648 | 640 | : in == UP_FUNC_REALSERVER_DISCONNECT_EVENT ? "UP_FUNC_REALSERVER_DISCONNECT_EVENT" |
649 | 641 | : in == UP_FUNC_REALSERVER_ALL_DISCONNECT ? "UP_FUNC_REALSERVER_ALL_DISCONNECT" |
@@ -653,8 +645,7 @@ protected: | ||
653 | 645 | : in == UP_FUNC_SORRYSERVER_CONNECT_EVENT ? "UP_FUNC_SORRYSERVER_CONNECT_EVENT" |
654 | 646 | : in == UP_FUNC_SORRYSERVER_CONNECT_FAIL_EVENT ? "UP_FUNC_SORRYSERVER_CONNECT_FAIL_EVENT" |
655 | 647 | : in == UP_FUNC_SORRYSERVER_SEND ? "UP_FUNC_SORRYSERVER_SEND" |
656 | - : in == UP_FUNC_SORRYSERVER_ASEND_HANDLE_EVENT ? "UP_FUNC_SORRYSERVER_ASEND_HANDLE_EVENT" | |
657 | - : in == UP_FUNC_SORRYSERVER_HANDLE_ASEND ? "UP_FUNC_SORRYSERVER_HANDLE_ASEND" | |
648 | + : in == UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND ? "UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND" | |
658 | 649 | : in == UP_FUNC_SORRYSERVER_DISCONNECT ? "UP_FUNC_SORRYSERVER_DISCONNECT" |
659 | 650 | : in == UP_FUNC_SORRYSERVER_MOD_DISCONNECT ? "UP_FUNC_SORRYSERVER_MOD_DISCONNECT" |
660 | 651 | : in == UP_FUNC_SORRYSERVER_DISCONNECT_EVENT ? "UP_FUNC_SORRYSERVER_DISCONNECT_EVENT" |
@@ -672,17 +663,14 @@ protected: | ||
672 | 663 | : in == DOWN_FUNC_CLIENT_DISCONNECT_EVENT ? "DOWN_FUNC_CLIENT_DISCONNECT_EVENT" |
673 | 664 | : in == DOWN_FUNC_CLIENT_CONNECTION_CHK ? "DOWN_FUNC_CLIENT_CONNECTION_CHK" |
674 | 665 | : in == DOWN_FUNC_CLIENT_SEND ? "DOWN_FUNC_CLIENT_SEND" |
675 | - : in == DOWN_FUNC_CLIENT_ASEND_HANDLE_EVENT ? "DOWN_FUNC_CLIENT_ASEND_HANDLE_EVENT" | |
676 | - : in == DOWN_FUNC_CLIENT_HANDLE_ASEND ? "DOWN_FUNC_CLIENT_HANDLE_ASEND" | |
666 | + : in == DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND ? "DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND" | |
677 | 667 | : in == DOWN_FUNC_CLIENT_RESPOND_SEND_EVENT ? "DOWN_FUNC_CLIENT_RESPOND_SEND_EVENT" |
678 | 668 | : in == DOWN_FUNC_REALSERVER_RECEIVE ? "DOWN_FUNC_REALSERVER_RECEIVE" |
679 | - : in == DOWN_FUNC_REALSERVER_ARECEIVE_HANDLE_EVENT ? "DOWN_FUNC_REALSERVER_ARECEIVE_HANDLE_EVENT" | |
680 | - : in == DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE ? "DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE" | |
669 | + : in == DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE ? "DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE" | |
681 | 670 | : in == DOWN_FUNC_REALSERVER_DISCONNECT ? "DOWN_FUNC_REALSERVER_DISCONNECT" |
682 | 671 | : in == DOWN_FUNC_REALSERVER_DISCONNECT_EVENT ? "DOWN_FUNC_REALSERVER_DISCONNECT_EVENT" |
683 | 672 | : in == DOWN_FUNC_SORRYSERVER_RECEIVE ? "DOWN_FUNC_SORRYSERVER_RECEIVE" |
684 | - : in == DOWN_FUNC_SORRYSERVER_ARECEIVE_HANDLE_EVENT ? "DOWN_FUNC_SORRYSERVER_ARECEIVE_HANDLE_EVENT" | |
685 | - : in == DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE ? "DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE" | |
673 | + : in == DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE ? "DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE" | |
686 | 674 | : in == DOWN_FUNC_SORRYSERVER_DISCONNECT ? "DOWN_FUNC_SORRYSERVER_DISCONNECT" |
687 | 675 | : in == DOWN_FUNC_SORRYSERVER_MOD_DISCONNECT ? "DOWN_FUNC_SORRYSERVER_MOD_DISCONNECT" |
688 | 676 | : in == DOWN_FUNC_SORRYSERVER_DISCONNECT_EVENT ? "DOWN_FUNC_SORRYSERVER_DISCONNECT_EVENT" |
@@ -161,9 +161,9 @@ tcp_session::tcp_session( | ||
161 | 161 | std::make_pair( |
162 | 162 | UP_FUNC_REALSERVER_SEND, |
163 | 163 | boost::bind(&tcp_session::up_thread_realserver_send, this, _1)); |
164 | - up_thread_function_array[UP_FUNC_REALSERVER_HANDLE_ASEND] = | |
164 | + up_thread_function_array[UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND] = | |
165 | 165 | std::make_pair( |
166 | - UP_FUNC_REALSERVER_HANDLE_ASEND, | |
166 | + UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND, | |
167 | 167 | boost::bind(&tcp_session::up_thread_realserver_handle_async_write_some, this, _1)); |
168 | 168 | up_thread_function_array[UP_FUNC_REALSERVER_DISCONNECT] = |
169 | 169 | std::make_pair( |
@@ -197,9 +197,9 @@ tcp_session::tcp_session( | ||
197 | 197 | std::make_pair( |
198 | 198 | UP_FUNC_SORRYSERVER_SEND, |
199 | 199 | boost::bind(&tcp_session::up_thread_sorryserver_send, this, _1)); |
200 | - up_thread_function_array[UP_FUNC_SORRYSERVER_HANDLE_ASEND] = | |
200 | + up_thread_function_array[UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND] = | |
201 | 201 | std::make_pair( |
202 | - UP_FUNC_SORRYSERVER_HANDLE_ASEND, | |
202 | + UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND, | |
203 | 203 | boost::bind(&tcp_session::up_thread_sorryserver_handle_async_write_some, this, _1)); |
204 | 204 | up_thread_function_array[UP_FUNC_SORRYSERVER_DISCONNECT] = |
205 | 205 | std::make_pair( |
@@ -262,17 +262,17 @@ tcp_session::tcp_session( | ||
262 | 262 | std::make_pair( |
263 | 263 | DOWN_FUNC_CLIENT_SEND, |
264 | 264 | boost::bind(&tcp_session::down_thread_client_send, this, _1)); |
265 | - down_thread_function_array[DOWN_FUNC_CLIENT_HANDLE_ASEND] = | |
265 | + down_thread_function_array[DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND] = | |
266 | 266 | std::make_pair( |
267 | - DOWN_FUNC_CLIENT_HANDLE_ASEND, | |
267 | + DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND, | |
268 | 268 | boost::bind(&tcp_session::down_thread_client_handle_async_write_some, this, _1)); |
269 | 269 | down_thread_function_array[DOWN_FUNC_REALSERVER_RECEIVE] = |
270 | 270 | std::make_pair( |
271 | 271 | DOWN_FUNC_REALSERVER_RECEIVE, |
272 | 272 | boost::bind(&tcp_session::down_thread_realserver_receive, this, _1)); |
273 | - down_thread_function_array[DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE] = | |
273 | + down_thread_function_array[DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE] = | |
274 | 274 | std::make_pair( |
275 | - DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE, | |
275 | + DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE, | |
276 | 276 | boost::bind(&tcp_session::down_thread_realserver_handle_async_read_some, this, _1)); |
277 | 277 | down_thread_function_array[DOWN_FUNC_REALSERVER_DISCONNECT] = |
278 | 278 | std::make_pair( |
@@ -286,9 +286,9 @@ tcp_session::tcp_session( | ||
286 | 286 | std::make_pair( |
287 | 287 | DOWN_FUNC_SORRYSERVER_RECEIVE, |
288 | 288 | boost::bind(&tcp_session::down_thread_sorryserver_receive, this, _1)); |
289 | - down_thread_function_array[DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE] = | |
289 | + down_thread_function_array[DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE] = | |
290 | 290 | std::make_pair( |
291 | - DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE, | |
291 | + DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE, | |
292 | 292 | boost::bind(&tcp_session::down_thread_sorryserver_handle_async_read_some, this, _1)); |
293 | 293 | down_thread_function_array[DOWN_FUNC_SORRYSERVER_DISCONNECT] = |
294 | 294 | std::make_pair( |
@@ -1543,7 +1543,7 @@ void tcp_session::up_thread_realserver_send(const TCP_PROCESS_TYPE_TAG process_t | ||
1543 | 1543 | } else { |
1544 | 1544 | if (error_code == boost::asio::error::try_again) { |
1545 | 1545 | upthread_status = UPTHREAD_LOCK; |
1546 | - func_tag = UP_FUNC_REALSERVER_HANDLE_ASEND; | |
1546 | + func_tag = UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND; | |
1547 | 1547 | basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler = |
1548 | 1548 | boost::bind(&tcp_session::up_thread_realserver_async_write_some_handler, |
1549 | 1549 | this, |
@@ -2128,7 +2128,7 @@ void tcp_session::up_thread_sorryserver_send(const TCP_PROCESS_TYPE_TAG process_ | ||
2128 | 2128 | } else { |
2129 | 2129 | if (ec == boost::asio::error::try_again) { |
2130 | 2130 | upthread_status = UPTHREAD_LOCK; |
2131 | - func_tag = UP_FUNC_SORRYSERVER_HANDLE_ASEND; | |
2131 | + func_tag = UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND; | |
2132 | 2132 | basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler = |
2133 | 2133 | boost::bind(&tcp_session::up_thread_sorryserver_async_write_some_handler, |
2134 | 2134 | this, |
@@ -2796,7 +2796,7 @@ void tcp_session::down_thread_realserver_receive(const TCP_PROCESS_TYPE_TAG proc | ||
2796 | 2796 | } else { |
2797 | 2797 | if (error_code == boost::asio::error::try_again) { |
2798 | 2798 | downthread_status = DOWNTHREAD_LOCK; |
2799 | - func_tag = DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE; | |
2799 | + func_tag = DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE; | |
2800 | 2800 | basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler = |
2801 | 2801 | boost::bind(&tcp_session::down_thread_realserver_async_read_some_handler, |
2802 | 2802 | this, |
@@ -3033,7 +3033,7 @@ void tcp_session::down_thread_client_send(const TCP_PROCESS_TYPE_TAG process_typ | ||
3033 | 3033 | if (error_code == boost::asio::error::try_again) { |
3034 | 3034 | |
3035 | 3035 | downthread_status = DOWNTHREAD_LOCK; |
3036 | - func_tag = DOWN_FUNC_CLIENT_HANDLE_ASEND; | |
3036 | + func_tag = DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND; | |
3037 | 3037 | basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler = |
3038 | 3038 | boost::bind(&tcp_session::down_thread_client_async_write_some_handler, |
3039 | 3039 | this, |
@@ -3208,7 +3208,7 @@ void tcp_session::down_thread_sorryserver_receive(const TCP_PROCESS_TYPE_TAG pro | ||
3208 | 3208 | } else { |
3209 | 3209 | if (error_code == boost::asio::error::try_again) { |
3210 | 3210 | downthread_status = DOWNTHREAD_LOCK; |
3211 | - func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE; | |
3211 | + func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE; | |
3212 | 3212 | basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler = |
3213 | 3213 | boost::bind(&tcp_session::down_thread_sorryserver_async_read_some_handler, |
3214 | 3214 | this, |
@@ -3678,7 +3678,7 @@ void tcp_session::up_thread_realserver_handle_async_write_some(const tcp_session | ||
3678 | 3678 | func_tag = up_thread_module_event_map[protocol_module->handle_realserver_send(up_thread_id)]; |
3679 | 3679 | } else { // error |
3680 | 3680 | if (up_thread_data_dest_side.get_error_code() == boost::asio::error::try_again) { |
3681 | - func_tag = UP_FUNC_REALSERVER_HANDLE_ASEND; | |
3681 | + func_tag = UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND; | |
3682 | 3682 | upthread_status = UPTHREAD_LOCK; |
3683 | 3683 | boost::array<char, MAX_BUFFER_SIZE>& send_buff = up_thread_data_dest_side.get_data(); |
3684 | 3684 | tcp_socket::async_rw_handler_t handler = boost::bind(&tcp_session::up_thread_realserver_async_write_some_handler, |
@@ -3765,7 +3765,7 @@ void tcp_session::up_thread_sorryserver_handle_async_write_some(const TCP_PROCES | ||
3765 | 3765 | func_tag = up_thread_module_event_map[protocol_module->handle_realserver_send(up_thread_id)]; |
3766 | 3766 | } else { |
3767 | 3767 | if (up_thread_data_dest_side.get_error_code() == boost::asio::error::try_again) { |
3768 | - func_tag = UP_FUNC_SORRYSERVER_HANDLE_ASEND; | |
3768 | + func_tag = UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND; | |
3769 | 3769 | upthread_status = UPTHREAD_LOCK; |
3770 | 3770 | |
3771 | 3771 | boost::array<char, MAX_BUFFER_SIZE>& send_buff = up_thread_data_dest_side.get_data(); |
@@ -3849,7 +3849,7 @@ void tcp_session::down_thread_realserver_handle_async_read_some(const tcp_sessio | ||
3849 | 3849 | func_tag = down_thread_module_event_map[module_event]; |
3850 | 3850 | } else { // zero byte recv = try again. |
3851 | 3851 | downthread_status = DOWNTHREAD_LOCK; |
3852 | - func_tag = DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE; | |
3852 | + func_tag = DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE; | |
3853 | 3853 | tcp_socket::async_rw_handler_t handler = boost::bind(&tcp_session::down_thread_realserver_async_read_some_handler, |
3854 | 3854 | this, |
3855 | 3855 | boost::asio::placeholders::error, |
@@ -3864,7 +3864,7 @@ void tcp_session::down_thread_realserver_handle_async_read_some(const tcp_sessio | ||
3864 | 3864 | } else { // error |
3865 | 3865 | if (error_code == boost::asio::error::try_again) { |
3866 | 3866 | downthread_status = DOWNTHREAD_LOCK; |
3867 | - func_tag = DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE; | |
3867 | + func_tag = DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE; | |
3868 | 3868 | tcp_socket::async_rw_handler_t handler = boost::bind(&tcp_session::down_thread_realserver_async_read_some_handler, |
3869 | 3869 | this, |
3870 | 3870 | boost::asio::placeholders::error, |
@@ -3960,7 +3960,7 @@ void tcp_session::down_thread_client_handle_async_write_some(tcp_session::TCP_PR | ||
3960 | 3960 | } |
3961 | 3961 | } else { //error |
3962 | 3962 | if (error_code == boost::asio::error::try_again) { |
3963 | - func_tag = DOWN_FUNC_CLIENT_HANDLE_ASEND; | |
3963 | + func_tag = DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND; | |
3964 | 3964 | downthread_status = DOWNTHREAD_LOCK; |
3965 | 3965 | tcp_socket::async_rw_handler_t handler = boost::bind( |
3966 | 3966 | &tcp_session::down_thread_client_async_write_some_handler, |
@@ -4041,7 +4041,7 @@ void tcp_session::down_thread_sorryserver_handle_async_read_some(tcp_session::TC | ||
4041 | 4041 | func_tag = down_thread_module_event_map[module_event]; |
4042 | 4042 | } else { // zero byte recv try_again |
4043 | 4043 | downthread_status = DOWNTHREAD_LOCK; |
4044 | - func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE; | |
4044 | + func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE; | |
4045 | 4045 | tcp_socket::async_rw_handler_t handler = |
4046 | 4046 | boost::bind(&tcp_session::down_thread_sorryserver_async_read_some_handler, |
4047 | 4047 | this, |
@@ -4052,7 +4052,7 @@ void tcp_session::down_thread_sorryserver_handle_async_read_some(tcp_session::TC | ||
4052 | 4052 | } else { |
4053 | 4053 | if (error_code == boost::asio::error::try_again) { |
4054 | 4054 | downthread_status = DOWNTHREAD_LOCK; |
4055 | - func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE; | |
4055 | + func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE; | |
4056 | 4056 | tcp_socket::async_rw_handler_t handler = |
4057 | 4057 | boost::bind(&tcp_session::down_thread_sorryserver_async_read_some_handler, |
4058 | 4058 | this, |