update code,server is stable now

Author: sguphil

AccSvr/AccountSvr.cpp

@@ -39,9 +39,6 @@ void AccountSvr::DestructNetWorkObj(NetWorkObject *netobj)
         return;
     }
 
-    close(session->getSocket()); //close socket
-    
-
     SESSION_TYPE type = session->getType();
     if ( eClient == type)
     {

DBSvr/main.cpp

@@ -28,13 +28,15 @@ int main()
 
 
     //multi thread ignore SIGPIPE
+    /*
     sigset_t bset, oset;
     sigemptyset(&bset);
     sigaddset(&bset, SIGPIPE);
     if (pthread_sigmask(SIG_BLOCK, &bset, &oset) != 0) 
     {
          printf("set thread signal mask fail!\n");
     }
+    */
 
     DBSvr* dbsvr = DBSvr::GetInstance();
     LOGI("Hello world! ServerID is:" << dbsvr->getServerID());

include/CIoThread.hpp

@@ -38,7 +38,7 @@ class CIoThread: public CBaseThread
                     //isRecvEvent = false;
                     CSession *session =  (CSession *)epEvent[i].data.ptr;
                     int32 oplen = 0;
-                    if (epEvent[i].events & EPOLLIN && session->getStatus() != waitdel) // recv msg
+                    if (epEvent[i].events & EPOLLIN) // recv msg
                     {
                         oplen = session->onRecv();
 
@@ -56,7 +56,7 @@ class CIoThread: public CBaseThread
 
                     #if 1 //double check sendbuf
 
-                    if (epEvent[i].events & EPOLLOUT && session->getStatus() != waitdel) // send msg
+                    if (epEvent[i].events & EPOLLOUT) // send msg
                     {
                         oplen = session->sendToSocket();
                         if (0 == oplen)

include/EpollServer.hpp

@@ -142,7 +142,7 @@ class EpollServer
         std::multimap<SESSION_TYPE, CSession *>::iterator it;
         for (it = m_ServerSessionMap.begin(); it != m_ServerSessionMap.end(); )
         {
-            if (it->second->getSessionId() == session->getSessionId())
+            if (it->second == session)
             {
                 m_ServerSessionMap.erase(it++);
                 //put in connector errrolist, wait for reconnect... !!!!todo.....verify not connector session
@@ -173,7 +173,7 @@ class EpollServer
         {
             for (it = m_ServerSessionMap.begin(); it != m_ServerSessionMap.end(); it++)
             {
-                if (it->first == type && (it->second)->getStatus() == active)
+                if (it->first == type)
                 {
                     return it->second;
                 }

include/baseHeader.h

@@ -80,6 +80,7 @@ enum eSESSIONSTATUS
     waitdel = 3, // deactive, need to remove
     registered = 4,//registered
     sock_SIGPIPE = 5, //recv signal pipe
+    sock_unused = 6, //still in poll not working
 };
 
 

make

@@ -1,7 +1,8 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-    echo "back args!!!"
+    echo "bad args!!!"
+    echo "usage: ./make [all|serverName]"
     exit 1
 fi
 

network/include/Session.h

@@ -89,6 +89,13 @@ class CSession
         return m_ptrServer;
     }
 
+    inline void closeSocket()
+    {
+        if (m_socket != -1)
+        {
+            close(m_socket);
+        }
+    }
     int32 processSend(uint16 sysid, uint16 msgid, char *msg, int32 msgsize)
     {
         #if 0

network/src/Connector.cpp

@@ -1,8 +1,6 @@
 #include "../include/Connector.h"
 #include "../../common/SIDGenerator.hpp"
 
-//static sem_t m_waitSem;
-
 Connector::Connector()
 {
     m_sessionFactory.init(2,2);
@@ -44,31 +42,24 @@ void Connector::addToErrorList(CSession *session)
 void Connector::reConnectAll()
 {
     m_connErrListLock.lock();
-    std::vector<CSession *> sessionvec;
 
     if (!m_connErrList.empty())
     {
-        sessionvec.reserve(m_connErrList.size());
         CommonList<CSession>::iterator iter;
         for (iter = m_connErrList.begin(); iter != m_connErrList.end(); )
         {
             if (preReConnect(*iter))
             {
-                sessionvec.push_back(*iter);
+                addToWaitList(*iter);
                 m_connErrList.erase(iter++);
             }
         }
     }
     m_connErrListLock.unLock();
-    for (uint32 i = 0; i < sessionvec.size(); i++)
-    {
-        addToWaitList(sessionvec[i]);
-    }
 }
 
 bool Connector::preReConnect(CSession *session)
 {
-    close(session->getSocket());//close the old socket
     Int32 cliSock = socket(AF_INET, SOCK_STREAM, 0); //create a new socket
     if (cliSock < 0)
     {
@@ -175,3 +166,4 @@ void* Connector::threadRoutine(void *args)
     }
     return NULL;
 }
+

network/src/Session.cpp

@@ -2,16 +2,14 @@
 #include "../../Factory/BaseFactory.h"
 #include "../../include/EpollServer.hpp"
 
-CSession::CSession() : m_pBindNetWorkObj(NULL), m_connSvrID(0), m_bIsFromSelf(false)
+CSession::CSession() : m_socket(-1),m_pBindNetWorkObj(NULL), m_connSvrID(0), m_bIsFromSelf(false)
 {
-    m_socket = -1;
     m_boActive = false;
 #if 0
     m_recvBuff.init(SESSIONBUFLEN, SESSIONBUFLEN);
     m_sendBuff.init(SESSIONBUFLEN, SESSIONBUFLEN);
 #endif
 
-    m_pBindNetWorkObj = NULL;
     m_nSessionId = 0;
     m_LeftPkgBuf = new char[MAXPKGLEN];
     assert(m_LeftPkgBuf != NULL);
@@ -32,7 +30,7 @@ CSession::~CSession()
         m_pBindNetWorkObj =  NULL;
     }
 
-    close(m_socket);
+    closeSocket();
 }
 
 void CSession::clear() // call when reuse
@@ -50,8 +48,9 @@ void CSession::clear() // call when reuse
     getServer()->DestructNetWorkObj(m_pBindNetWorkObj);
     m_RecvBufManager.clear();
     m_SendBufManager.clear();
-    close(m_socket);
+    closeSocket();
     m_pBindNetWorkObj =  NULL;
+    m_eStatus = sock_unused;
 }
 
 #if 0
@@ -100,7 +99,7 @@ int32 CSession::onRecv()
         recvlen = recv(m_socket, (void *)(curpkg->getPkgWritePos()), leftLen, 0);
         if (0 == recvlen)
         {
-            printf("====================socket!!!!!!!!recv return 0!!!!!!!!errno:%d\n", errno);
+            printf("====================socket!!!!!!!!recv return 0!!!!!!!!errno:%d EAGAIN:%d\n", errno, EAGAIN);
             perror("recv error");
             return -1;
         } else if (ispkgbody && (leftLen == recvlen)) // why we return? !!! avoid the infinity loop while the socket buf is always get data from a very busy send client

testclient/TestClient.cpp

@@ -320,14 +320,14 @@ void TestClient::update()
 {
     while (true)
     {
-        if (acct_time::getCurTimeMs() >= m_nNextTick)
+        if (true || acct_time::getCurTimeMs() >= m_nNextTick)
         {
             m_nNextTick = acct_time::getCurTimeMs() + 100;
             updateSessionList(); // handle new Session
             handleActiveSession();
             removeDeadSession();
         }
-        //acct_time::sleepMs(1); // sleep 1ms per loop
+        acct_time::sleepMs(100); // sleep 1ms per loop
     }
 
 }