OSDN -- 開發和下載開源軟體
繁體中文翻譯狀態 translation status for zh-tw
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

UltraMonkey-L7 V3(multi-thread implementation)


Commit MetaInfo

修訂17126b3c06102a6682eec4184480e4160796586c (tree)
時間2012-07-31 11:31:30
作者Hiroaki Nakano <nakano.hiroaki@nttc...>
CommiterHiroaki Nakano

Log Message

Merge branch '1a0320df21c18f7fe764c9e2c0e59f4810e26073' into v3.0.4-devel

Change Summary

差異

--- a/l7vsd/include/tcp_session.h
+++ b/l7vsd/include/tcp_session.h
@@ -144,7 +144,6 @@ protected:
144144 UP_FUNC_CLIENT_DISCONNECT, //! up_thread_client_disconnect function
145145 UP_FUNC_CLIENT_DISCONNECT_EVENT, //! up_thread_client_disconnect_event function
146146 UP_FUNC_CLIENT_RECEIVE, //! up_thread_client_receive function
147- UP_FUNC_CLIENT_ARECEIVE_HANDLE_EVENT, //! up_thread_client_asnc_read_some_handler function
148147 UP_FUNC_CLIENT_HANDLE_ARECIEVE, //! up_thread_client_handle_async_read_some function
149148 UP_FUNC_CLIENT_RESPOND_SEND, //! up_thread_client_respond function
150149 UP_FUNC_CLIENT_RESPOND_SEND_EVENT, //! up_thread_client_respond_event function
@@ -153,8 +152,7 @@ protected:
153152 UP_FUNC_REALSERVER_CONNECT_EVENT, //! up_thread_realserver_connect_event function
154153 UP_FUNC_REALSERVER_CONNECT_FAIL_EVENT, //! up_thread_realserver_connection_fail_event function
155154 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
158156 UP_FUNC_REALSERVER_DISCONNECT, //! up_thread_realserver_disconnect function
159157 UP_FUNC_REALSERVER_DISCONNECT_EVENT, //! up_thread_realserver_disconnect_event function
160158 UP_FUNC_REALSERVER_ALL_DISCONNECT, //! up_thread_realserver_asll_disconnect function
@@ -164,8 +162,7 @@ protected:
164162 UP_FUNC_SORRYSERVER_CONNECT_EVENT, //! up_thread_sorryserver_connect_event function
165163 UP_FUNC_SORRYSERVER_CONNECT_FAIL_EVENT, //! up_thread_sorryserver_connection_fail_event function
166164 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
169166 UP_FUNC_SORRYSERVER_DISCONNECT, //! up_thread_sorryserver_disconnect function
170167 UP_FUNC_SORRYSERVER_MOD_DISCONNECT, //! up_thread_sorryserver_mod_disconnect function
171168 UP_FUNC_SORRYSERVER_DISCONNECT_EVENT, //! up_thread_sorryserver_disconnect_event function
@@ -184,18 +181,15 @@ protected:
184181 DOWN_FUNC_CLIENT_DISCONNECT_EVENT, //! down_thread_client_disconnect_event function
185182 DOWN_FUNC_CLIENT_CONNECTION_CHK, //! down_thread_client_connection_chk_event function
186183 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
189185 DOWN_FUNC_CLIENT_RESPOND_SEND_EVENT, //! down_thread_client_respond_event function
190186 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
193188 DOWN_FUNC_REALSERVER_DISCONNECT, //! down_thread_realserver_disconnect function
194189 DOWN_FUNC_REALSERVER_DISCONNECT_EVENT, //! down_thread_realserver_disconnect_event function
195190 DOWN_FUNC_REALSERVER_ALL_DISCONNECT, //! down_thread_all_realserver_disconnect function
196191 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
199193 DOWN_FUNC_SORRYSERVER_DISCONNECT, //! down_thread_sorryserver_disconnect function
200194 DOWN_FUNC_SORRYSERVER_MOD_DISCONNECT, //! down_thread_sorryserver_mod_disconnect function
201195 DOWN_FUNC_SORRYSERVER_DISCONNECT_EVENT, //! down_thread_sorryserver_disconnect_event function
@@ -633,7 +627,6 @@ protected:
633627 : in == UP_FUNC_CLIENT_DISCONNECT ? "UP_FUNC_CLIENT_DISCONNECT"
634628 : in == UP_FUNC_CLIENT_DISCONNECT_EVENT ? "UP_FUNC_CLIENT_DISCONNECT_EVENT"
635629 : in == UP_FUNC_CLIENT_RECEIVE ? "UP_FUNC_CLIENT_RECEIVE"
636- : in == UP_FUNC_CLIENT_ARECEIVE_HANDLE_EVENT ? "UP_FUNC_CLIENT_ARECIEVE_HANDLE_EVENT"
637630 : in == UP_FUNC_CLIENT_HANDLE_ARECIEVE ? "UP_FUNC_CLIENT_HANDLE_ARECIEVE"
638631 : in == UP_FUNC_CLIENT_RESPOND_SEND ? "UP_FUNC_CLIENT_RESPOND_SEND"
639632 : in == UP_FUNC_CLIENT_RESPOND_SEND_EVENT ? "UP_FUNC_CLIENT_RESPOND_SEND_EVENT"
@@ -642,8 +635,7 @@ protected:
642635 : in == UP_FUNC_REALSERVER_CONNECT_EVENT ? "UP_FUNC_REALSERVER_CONNECT_EVENT"
643636 : in == UP_FUNC_REALSERVER_CONNECT_FAIL_EVENT ? "UP_FUNC_REALSERVER_CONNECT_FAIL_EVENT"
644637 : 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"
647639 : in == UP_FUNC_REALSERVER_DISCONNECT ? "UP_FUNC_REALSERVER_DISCONNECT"
648640 : in == UP_FUNC_REALSERVER_DISCONNECT_EVENT ? "UP_FUNC_REALSERVER_DISCONNECT_EVENT"
649641 : in == UP_FUNC_REALSERVER_ALL_DISCONNECT ? "UP_FUNC_REALSERVER_ALL_DISCONNECT"
@@ -653,8 +645,7 @@ protected:
653645 : in == UP_FUNC_SORRYSERVER_CONNECT_EVENT ? "UP_FUNC_SORRYSERVER_CONNECT_EVENT"
654646 : in == UP_FUNC_SORRYSERVER_CONNECT_FAIL_EVENT ? "UP_FUNC_SORRYSERVER_CONNECT_FAIL_EVENT"
655647 : 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"
658649 : in == UP_FUNC_SORRYSERVER_DISCONNECT ? "UP_FUNC_SORRYSERVER_DISCONNECT"
659650 : in == UP_FUNC_SORRYSERVER_MOD_DISCONNECT ? "UP_FUNC_SORRYSERVER_MOD_DISCONNECT"
660651 : in == UP_FUNC_SORRYSERVER_DISCONNECT_EVENT ? "UP_FUNC_SORRYSERVER_DISCONNECT_EVENT"
@@ -672,17 +663,14 @@ protected:
672663 : in == DOWN_FUNC_CLIENT_DISCONNECT_EVENT ? "DOWN_FUNC_CLIENT_DISCONNECT_EVENT"
673664 : in == DOWN_FUNC_CLIENT_CONNECTION_CHK ? "DOWN_FUNC_CLIENT_CONNECTION_CHK"
674665 : 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"
677667 : in == DOWN_FUNC_CLIENT_RESPOND_SEND_EVENT ? "DOWN_FUNC_CLIENT_RESPOND_SEND_EVENT"
678668 : 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"
681670 : in == DOWN_FUNC_REALSERVER_DISCONNECT ? "DOWN_FUNC_REALSERVER_DISCONNECT"
682671 : in == DOWN_FUNC_REALSERVER_DISCONNECT_EVENT ? "DOWN_FUNC_REALSERVER_DISCONNECT_EVENT"
683672 : 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"
686674 : in == DOWN_FUNC_SORRYSERVER_DISCONNECT ? "DOWN_FUNC_SORRYSERVER_DISCONNECT"
687675 : in == DOWN_FUNC_SORRYSERVER_MOD_DISCONNECT ? "DOWN_FUNC_SORRYSERVER_MOD_DISCONNECT"
688676 : in == DOWN_FUNC_SORRYSERVER_DISCONNECT_EVENT ? "DOWN_FUNC_SORRYSERVER_DISCONNECT_EVENT"
--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -161,9 +161,9 @@ tcp_session::tcp_session(
161161 std::make_pair(
162162 UP_FUNC_REALSERVER_SEND,
163163 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] =
165165 std::make_pair(
166- UP_FUNC_REALSERVER_HANDLE_ASEND,
166+ UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND,
167167 boost::bind(&tcp_session::up_thread_realserver_handle_async_write_some, this, _1));
168168 up_thread_function_array[UP_FUNC_REALSERVER_DISCONNECT] =
169169 std::make_pair(
@@ -197,9 +197,9 @@ tcp_session::tcp_session(
197197 std::make_pair(
198198 UP_FUNC_SORRYSERVER_SEND,
199199 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] =
201201 std::make_pair(
202- UP_FUNC_SORRYSERVER_HANDLE_ASEND,
202+ UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND,
203203 boost::bind(&tcp_session::up_thread_sorryserver_handle_async_write_some, this, _1));
204204 up_thread_function_array[UP_FUNC_SORRYSERVER_DISCONNECT] =
205205 std::make_pair(
@@ -262,17 +262,17 @@ tcp_session::tcp_session(
262262 std::make_pair(
263263 DOWN_FUNC_CLIENT_SEND,
264264 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] =
266266 std::make_pair(
267- DOWN_FUNC_CLIENT_HANDLE_ASEND,
267+ DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND,
268268 boost::bind(&tcp_session::down_thread_client_handle_async_write_some, this, _1));
269269 down_thread_function_array[DOWN_FUNC_REALSERVER_RECEIVE] =
270270 std::make_pair(
271271 DOWN_FUNC_REALSERVER_RECEIVE,
272272 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] =
274274 std::make_pair(
275- DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE,
275+ DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE,
276276 boost::bind(&tcp_session::down_thread_realserver_handle_async_read_some, this, _1));
277277 down_thread_function_array[DOWN_FUNC_REALSERVER_DISCONNECT] =
278278 std::make_pair(
@@ -286,9 +286,9 @@ tcp_session::tcp_session(
286286 std::make_pair(
287287 DOWN_FUNC_SORRYSERVER_RECEIVE,
288288 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] =
290290 std::make_pair(
291- DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE,
291+ DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE,
292292 boost::bind(&tcp_session::down_thread_sorryserver_handle_async_read_some, this, _1));
293293 down_thread_function_array[DOWN_FUNC_SORRYSERVER_DISCONNECT] =
294294 std::make_pair(
@@ -1543,7 +1543,7 @@ void tcp_session::up_thread_realserver_send(const TCP_PROCESS_TYPE_TAG process_t
15431543 } else {
15441544 if (error_code == boost::asio::error::try_again) {
15451545 upthread_status = UPTHREAD_LOCK;
1546- func_tag = UP_FUNC_REALSERVER_HANDLE_ASEND;
1546+ func_tag = UP_FUNC_REALSERVER_HANDLE_ASYNC_SEND;
15471547 basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler =
15481548 boost::bind(&tcp_session::up_thread_realserver_async_write_some_handler,
15491549 this,
@@ -2128,7 +2128,7 @@ void tcp_session::up_thread_sorryserver_send(const TCP_PROCESS_TYPE_TAG process_
21282128 } else {
21292129 if (ec == boost::asio::error::try_again) {
21302130 upthread_status = UPTHREAD_LOCK;
2131- func_tag = UP_FUNC_SORRYSERVER_HANDLE_ASEND;
2131+ func_tag = UP_FUNC_SORRYSERVER_HANDLE_ASYNC_SEND;
21322132 basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler =
21332133 boost::bind(&tcp_session::up_thread_sorryserver_async_write_some_handler,
21342134 this,
@@ -2796,7 +2796,7 @@ void tcp_session::down_thread_realserver_receive(const TCP_PROCESS_TYPE_TAG proc
27962796 } else {
27972797 if (error_code == boost::asio::error::try_again) {
27982798 downthread_status = DOWNTHREAD_LOCK;
2799- func_tag = DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE;
2799+ func_tag = DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE;
28002800 basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler =
28012801 boost::bind(&tcp_session::down_thread_realserver_async_read_some_handler,
28022802 this,
@@ -3033,7 +3033,7 @@ void tcp_session::down_thread_client_send(const TCP_PROCESS_TYPE_TAG process_typ
30333033 if (error_code == boost::asio::error::try_again) {
30343034
30353035 downthread_status = DOWNTHREAD_LOCK;
3036- func_tag = DOWN_FUNC_CLIENT_HANDLE_ASEND;
3036+ func_tag = DOWN_FUNC_CLIENT_HANDLE_ASYNC_SEND;
30373037 basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler =
30383038 boost::bind(&tcp_session::down_thread_client_async_write_some_handler,
30393039 this,
@@ -3208,7 +3208,7 @@ void tcp_session::down_thread_sorryserver_receive(const TCP_PROCESS_TYPE_TAG pro
32083208 } else {
32093209 if (error_code == boost::asio::error::try_again) {
32103210 downthread_status = DOWNTHREAD_LOCK;
3211- func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE;
3211+ func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE;
32123212 basic_tcp_socket<boost::asio::ip::tcp>::async_rw_handler_t handler =
32133213 boost::bind(&tcp_session::down_thread_sorryserver_async_read_some_handler,
32143214 this,
@@ -3678,7 +3678,7 @@ void tcp_session::up_thread_realserver_handle_async_write_some(const tcp_session
36783678 func_tag = up_thread_module_event_map[protocol_module->handle_realserver_send(up_thread_id)];
36793679 } else { // error
36803680 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;
36823682 upthread_status = UPTHREAD_LOCK;
36833683 boost::array<char, MAX_BUFFER_SIZE>& send_buff = up_thread_data_dest_side.get_data();
36843684 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
37653765 func_tag = up_thread_module_event_map[protocol_module->handle_realserver_send(up_thread_id)];
37663766 } else {
37673767 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;
37693769 upthread_status = UPTHREAD_LOCK;
37703770
37713771 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
38493849 func_tag = down_thread_module_event_map[module_event];
38503850 } else { // zero byte recv = try again.
38513851 downthread_status = DOWNTHREAD_LOCK;
3852- func_tag = DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE;
3852+ func_tag = DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE;
38533853 tcp_socket::async_rw_handler_t handler = boost::bind(&tcp_session::down_thread_realserver_async_read_some_handler,
38543854 this,
38553855 boost::asio::placeholders::error,
@@ -3864,7 +3864,7 @@ void tcp_session::down_thread_realserver_handle_async_read_some(const tcp_sessio
38643864 } else { // error
38653865 if (error_code == boost::asio::error::try_again) {
38663866 downthread_status = DOWNTHREAD_LOCK;
3867- func_tag = DOWN_FUNC_REALSERVER_HANDLE_ARECEIVE;
3867+ func_tag = DOWN_FUNC_REALSERVER_HANDLE_ASYNC_RECEIVE;
38683868 tcp_socket::async_rw_handler_t handler = boost::bind(&tcp_session::down_thread_realserver_async_read_some_handler,
38693869 this,
38703870 boost::asio::placeholders::error,
@@ -3960,7 +3960,7 @@ void tcp_session::down_thread_client_handle_async_write_some(tcp_session::TCP_PR
39603960 }
39613961 } else { //error
39623962 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;
39643964 downthread_status = DOWNTHREAD_LOCK;
39653965 tcp_socket::async_rw_handler_t handler = boost::bind(
39663966 &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
40414041 func_tag = down_thread_module_event_map[module_event];
40424042 } else { // zero byte recv try_again
40434043 downthread_status = DOWNTHREAD_LOCK;
4044- func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE;
4044+ func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE;
40454045 tcp_socket::async_rw_handler_t handler =
40464046 boost::bind(&tcp_session::down_thread_sorryserver_async_read_some_handler,
40474047 this,
@@ -4052,7 +4052,7 @@ void tcp_session::down_thread_sorryserver_handle_async_read_some(tcp_session::TC
40524052 } else {
40534053 if (error_code == boost::asio::error::try_again) {
40544054 downthread_status = DOWNTHREAD_LOCK;
4055- func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ARECEIVE;
4055+ func_tag = DOWN_FUNC_SORRYSERVER_HANDLE_ASYNC_RECEIVE;
40564056 tcp_socket::async_rw_handler_t handler =
40574057 boost::bind(&tcp_session::down_thread_sorryserver_async_read_some_handler,
40584058 this,