[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] engine/core server_info.cpp, 1.32.2.2, 1.32.2.3 _main.cpp, 1.216.2.5, 1.216.2.6
From:       ryuan () helixcommunity ! org
Date:       2012-11-25 13:59:20
[Download RAW message or body]

Update of /cvsroot/server/engine/core
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv17344/server/engine/core

Modified Files:
      Tag: SERVER_15_0
	server_info.cpp _main.cpp 
Log Message:
Synopsis: 
===============
Revert some codes back

Branch: SERVER_15_0_RN, HEAD

Suggested Reviewers: Anyone

Description: 
===============
Add some log to RSS log to monitor Object Count

Files affected:
===============
server-restricted/broadcast/transport/bcng/recv/strmhand.cpp
server-restricted/broadcast/transport/bcng/recv/strmsess.cpp
server-restricted/broadcast/transport/bcng/recv/pub/strmhand.h
server-restricted/broadcast/transport/bcng/recv/pub/strmsess.h
server/include/hxservinfo.h
server/engine/core/pub/server_info.h
server/engine/core/server_info.cpp
server/engine/core/_main.cpp
server/common/util/pub/pktreorderqueue.h
server/common/util/pktreorderqueue.cpp

Testing Performed: 
===============
Integration Tests:
N/A

Performance Tests: 
N/A

QA Hints
========
None.



Index: _main.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/_main.cpp,v
retrieving revision 1.216.2.5
retrieving revision 1.216.2.6
diff -u -d -r1.216.2.5 -r1.216.2.6
--- _main.cpp	14 Nov 2012 13:36:41 -0000	1.216.2.5
+++ _main.cpp	25 Nov 2012 13:59:02 -0000	1.216.2.6
@@ -191,6 +191,9 @@
 #ifdef HELIX_FEATURE_SECURE_LICENSE
 #include "systeminfo.h"
 #endif
+#ifdef HELIX_FEATURE_SERVER_RECORD_OBJECT
+#include "pktreorderqueue.h"
+#endif
 
 #define SELF_DEFINE_RESTART_SIGNAL 255
 
@@ -3741,6 +3744,12 @@
         m_pProc->pc->server_info->m_lSessionmgrCount,
         m_pProc->pc->server_info->m_lSecuritymgrCount);
 
+    pBufPointer += sprintf(pBufPointer, "    Object Count: IncomingSession: %d, \
IncomingHandler: %d, CQueueEntry: %d, CInorderPacketQueue: %d\n", +        \
m_pProc->pc->server_info->m_lIncomingSessionCount, +        \
m_pProc->pc->server_info->m_lIncomingHandlerCount, +        \
CQueueEntry::zm_lInstanceCount, +        CInorderPacketQueue::zm_lInstanceCount);
+
     pBufPointer += sprintf(pBufPointer, "    Object Count: ServerBuffer: %d, \
ServerPacket: %d\n",  ServerBuffer::zm_lInstanceCount,
         ServerPacket::zm_lInstanceCount);

Index: server_info.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/server_info.cpp,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -u -d -r1.32.2.2 -r1.32.2.3
--- server_info.cpp	14 Nov 2012 13:00:16 -0000	1.32.2.2
+++ server_info.cpp	25 Nov 2012 13:59:02 -0000	1.32.2.3
@@ -100,6 +100,10 @@
     &ServerInfo::IncrementHTTPProtCount,
     &ServerInfo::IncrementSessionMgrCount,
     &ServerInfo::IncrementSecurityMgrCount,
+
+    &ServerInfo::IncrementIncomingSessionCount,
+    &ServerInfo::IncrementIncomingHandlerCount,
+
 #endif
 };
 
@@ -141,6 +145,9 @@
     &ServerInfo::DecrementHTTPProtCount,
     &ServerInfo::DecrementSessionMgrCount,
     &ServerInfo::DecrementSecurityMgrCount,
+
+    &ServerInfo::DecrementIncomingSessionCount,
+    &ServerInfo::DecrementIncomingHandlerCount,
 #endif
 
 };
@@ -308,6 +315,9 @@
           , m_lHTTPProCount(0)
           , m_lSessionmgrCount(0)
           , m_lSecuritymgrCount(0)
+
+          , m_lIncomingSessionCount(0)
+          , m_lIncomingHandlerCount(0)
 #endif
 
 {
@@ -584,6 +594,9 @@
     m_RegID[SESSIONMGR_COUNT] = \
                pProc->pc->registry->AddInt("Server.SessionmgrCount", 0, pProc);
     m_RegID[SECURITYMGR_COUNT] = \
pProc->pc->registry->AddInt("Server.SecuritymgrCount", 0, pProc);  
+    m_RegID[INCOMINGSESSION_COUNT] = \
pProc->pc->registry->AddInt("Server.IncomingSessionCount", 0, pProc); +    \
m_RegID[INCOMINGHANDLER_COUNT] = \
pProc->pc->registry->AddInt("Server.IncomingHandlerCount", 0, pProc); +
 #endif
 }
 


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]