hide signalkeeper from netcore

Author: garryyan

mars/comm/socket/tcp_fsm_handler.h

@@ -26,6 +26,7 @@
 template<class InputIterator>
 bool TcpFSMHandler(InputIterator _first, InputIterator _last, SocketSelectBreaker& _breaker, bool _select_anyway)
 {
+	xverbose_function();
     xgroup2_define(group);
 
     SocketSelect sel(_breaker, true);

mars/comm/socket/tcpserver_fsm.cc

@@ -26,7 +26,7 @@
 #include "comm/socket/tcpserver_fsm.h"
 
 TcpServerFSM::TcpServerFSM(SOCKET _socket)
-    : status_(kAccept), sock_(_socket) {
+    : status_(kAccept), sock_(_socket), is_write_fd_set_(false) {
     xassert2(INVALID_SOCKET != sock_);
     socklen_t addr_len = sizeof(addr_);
     xerror2_if(0 > getpeername(sock_, (sockaddr*)&addr_, &addr_len), TSF"getpeername:%_, %_", socket_errno, socket_strerror(socket_errno));
@@ -36,7 +36,7 @@ TcpServerFSM::TcpServerFSM(SOCKET _socket)
 }
 
 TcpServerFSM::TcpServerFSM(SOCKET _socket, const sockaddr_in& _addr)
-    : status_(kAccept), sock_(_socket), addr_(_addr) {
+    : status_(kAccept), sock_(_socket), addr_(_addr) , is_write_fd_set_(false){
     memset(ip_, 0, sizeof(ip_));
     inet_ntop(addr_.sin_family, &(addr_.sin_addr), ip_, sizeof(ip_));
 }
@@ -120,7 +120,12 @@ TcpServerFSM::TSocketStatus TcpServerFSM::PreReadWriteSelect(SocketSelect& _sel,
     _sel.Read_FD_SET(sock_);
     _sel.Exception_FD_SET(sock_);
 
-    if (0 < send_buf_.Length())_sel.Write_FD_SET(sock_);
+    if (0 < send_buf_.Length()) {
+    	WriteFDSet(true);
+    	_sel.Write_FD_SET(sock_);
+    } else {
+    	WriteFDSet(false);
+    }
 
     return status_;
 }

mars/comm/socket/tcpserver_fsm.h

@@ -23,6 +23,9 @@
 
 #include "comm/autobuffer.h"
 #include "comm/socket/unix_socket.h"
+#include "comm/xlogger/xlogger.h"
+#include "comm/thread/mutex.h"
+#include "comm/thread/lock.h"
 
 class XLogger;
 class SocketSelect;
@@ -51,6 +54,17 @@ class TcpServerFSM {
     size_t SendBufLen() {return send_buf_.Length();}
     void Close(bool _notify = true);
 
+    bool WriteFDSet()
+    {
+    	ScopedLock lock (write_fd_set_mutex_);
+    	return is_write_fd_set_;
+    }
+    void WriteFDSet(bool _is_set) {
+    	xverbose_function(TSF"_is_set:%_, is_write_fd_set_:%_", _is_set, is_write_fd_set_);
+    	ScopedLock lock (write_fd_set_mutex_);
+    	is_write_fd_set_  = _is_set;
+    }
+
     virtual TSocketStatus PreSelect(SocketSelect& _sel, XLogger& _log);
     virtual TSocketStatus AfterSelect(SocketSelect& _sel, XLogger& _log);
     virtual int Timeout() const;
@@ -80,6 +94,9 @@ class TcpServerFSM {
 
     AutoBuffer send_buf_;
     AutoBuffer recv_buf_;
+
+    bool is_write_fd_set_;
+    Mutex write_fd_set_mutex_;
 };
 
 #endif /* TcpServerFSM_H_ */

mars/libraries/mars_utils.py

@@ -24,9 +24,9 @@
 WIN_COPY_EXT_FILES = {"stn/proto/longlink_packer.h": "longlink_packer.h",
         "stn/proto/stnproto_logic.h": "stnproto_logic.h",
         "stn/proto/longlink_packer.cc__": "longlink_packer.cc.rewriteme",
-        "comm/windows/projdef.h": "mars-open/comm/projdef.h",
-        "comm/windows/sys/cdefs.h": "mars-open/comm/sys/cdefs.h",
-        "comm/windows/sys/time.h": "mars-open/comm/sys/time.h"
+        "comm/windows/projdef.h": "mars/comm/projdef.h",
+        "comm/windows/sys/cdefs.h": "mars/comm/sys/cdefs.h",
+        "comm/windows/sys/time.h": "mars/comm/sys/time.h"
         }
 
 html_css = '''

mars/stn/src/net_core.cc

@@ -25,9 +25,12 @@
 #include "boost/bind.hpp"
 #include "boost/ref.hpp"
 
+#include "openssl/export_include/openssl_multi_thread_support.h"
+
 #include "mars/app/app.h"
 #include "mars/baseevent/active_logic.h"
 #include "mars/comm/messagequeue/message_queue.h"
+#include "mars/comm/network/netinfo_util.h"
 #include "mars/comm/socket/local_ipstack.h"
 #include "mars/comm/xlogger/xlogger.h"
 #include "mars/comm/singleton.h"
@@ -51,8 +54,7 @@
 
 #include "signalling_keeper.h"
 #include "zombie_task_manager.h"
-#include "openssl/export_include/openssl_multi_thread_support.h"
-#include "comm/network/netinfo_util.h"
+
 using namespace mars::stn;
 using namespace mars::app;
 
@@ -443,6 +445,14 @@ void NetCore::OnNetworkChange() {
    ASYNC_BLOCK_END
 }
 
+void NetCore::KeepSignal() {
+	signalling_keeper_->Keep();
+}
+
+void NetCore::StopSignal() {
+	signalling_keeper_->Stop();
+}
+
 #ifdef USE_LONG_LINK
 #ifdef __APPLE__
 void NetCore::__ResetLongLink() {

mars/stn/src/net_core.h

@@ -83,11 +83,11 @@ class NetCore {
     bool    LongLinkIsConnected();
     void    OnNetworkChange();
 
+    void	KeepSignal();
+    void	StopSignal();
+
 #ifdef USE_LONG_LINK
-    SignallingKeeper&    GetSignallingKeeper() {return *signalling_keeper_;}
     LongLinkTaskManager& GetLongLinkTaskManager() {return *longlink_task_manager_;}
-    NetSourceTimerCheck& GetNetSourceTimerCheck() {return *netsource_timercheck_;}
-    ShortLinkTaskManager& GetShortLinkTaskManager() {return *shortlink_task_manager_;}
 #endif
 
   private:

mars/stn/stn_logic.cc

@@ -231,13 +231,13 @@ void SetSignallingStrategy(long _period, long _keepTime) {
 
 void KeepSignalling() {
 #ifdef USE_LONG_LINK
-    STN_WEAK_CALL(GetSignallingKeeper().Keep());
+    STN_WEAK_CALL(KeepSignal());
 #endif
 }
 
 void StopSignalling() {
 #ifdef USE_LONG_LINK
-    STN_WEAK_CALL(GetSignallingKeeper().Stop());
+    STN_WEAK_CALL(StopSignal());
 #endif
 }