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

List:       helix-server-cvs
Subject:    [Server-cvs] engine/core _main.cpp,1.226.4.5,1.226.4.6
From:       rexwangreal () helixcommunity ! org
Date:       2013-07-19 12:34:56
[Download RAW message or body]

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

Modified Files:
      Tag: SERVER_15_1_0
	_main.cpp 
Log Message:

Synopsis:
=================================================
Fix HLXSRV-555 - In the log file rmstdout.log, the statistical data of players about \
                protocol (RTSP,RTMP,MMS,HTTP)is not correct.
Branch: SERVER_CURRENT_RN SERVER_15_1_0_RN

Suggested Reviewers: Anyone


Description:
=================================================

These methods improved:
    RSSCoreStatsReport::ReportVhost()
    RSSCoreStatsReport::Report()
    RTMPTSession::UpdateServerInfoCounters()
    RTMPTSession::UpdateServerInfoCountersVhost()


Files affected:
=================================================
server/engine/core/_main.cpp
server_rn/protocol/flash/rtmpt/rtmptsession.cpp


Testing Performed:
===============
Centos 6.2 x64 


QA Hints
========
N/A




Index: _main.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/_main.cpp,v
retrieving revision 1.226.4.5
retrieving revision 1.226.4.6
diff -u -d -r1.226.4.5 -r1.226.4.6
--- _main.cpp	19 Jul 2013 11:42:24 -0000	1.226.4.5
+++ _main.cpp	19 Jul 2013 12:34:48 -0000	1.226.4.6
@@ -3102,17 +3102,16 @@
                 pGeneralInfo->m_UDPTransCount +
                 pGeneralInfo->m_MulticastTransCount;
 
-    INT32 lTotalClient =
-                pGeneralInfo->m_RTSPClientCount +
-                pGeneralInfo->m_MMSClientCount +
-                pGeneralInfo->m_HTTPClientCount  +
-                pGeneralInfo->m_RTMPClientCount;
-
     INT32 lTotalHTTPConns =
                 pGeneralInfo->m_HTTPClientCount  +
                 pGeneralInfo->m_CloakedClientCount + 
                 pGeneralInfo->m_WMTClientCount;
 
+    INT32 lTotalClient =
+                pGeneralInfo->m_RTSPClientCount +
+                pGeneralInfo->m_MMSClientCount +
+                pGeneralInfo->m_RTMPClientCount + lTotalHTTPConns;
+
 #if defined(_LONG_IS_64) || defined(_WIN64)
     UINT64 nBytesServed = \
                ServerInfo::CounterDifference((UINT64*)&(pGeneralInfo->m_nLastBytesServedRSS),
                
                                                         \
(UINT64)(pGeneralInfo->m_ulGBytesServed)); @@ -3573,17 +3572,16 @@
                 m_pProc->pc->server_info->m_GeneralInfo.m_UDPTransCount +
                 m_pProc->pc->server_info->m_GeneralInfo.m_MulticastTransCount;
 
-    INT32 lTotalClient =
-                m_pProc->pc->server_info->m_GeneralInfo.m_RTSPClientCount +
-                m_pProc->pc->server_info->m_GeneralInfo.m_MMSClientCount +
-                m_pProc->pc->server_info->m_GeneralInfo.m_HTTPClientCount  +
-                m_pProc->pc->server_info->m_GeneralInfo.m_RTMPClientCount;
-
     INT32 lTotalHTTPConns =
                 m_pProc->pc->server_info->m_GeneralInfo.m_HTTPClientCount  +
                 m_pProc->pc->server_info->m_GeneralInfo.m_CloakedClientCount +
                 m_pProc->pc->server_info->m_GeneralInfo.m_WMTClientCount;
 
+    INT32 lTotalClient =
+                m_pProc->pc->server_info->m_GeneralInfo.m_RTSPClientCount +
+                m_pProc->pc->server_info->m_GeneralInfo.m_MMSClientCount +
+                m_pProc->pc->server_info->m_GeneralInfo.m_RTMPClientCount + \
lTotalHTTPConns; +
     ServerInfo* pServerInfo = m_pProc->pc->server_info;
 
 #if defined(_LONG_IS_64) || defined(_WIN64)


_______________________________________________
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]