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

List:       helix-server-cvs
Subject:    [Server-cvs] engine/core _main.cpp,1.210,1.210.2.1
From:       yijil () helixcommunity ! org
Date:       2011-12-22 7:37:02
[Download RAW message or body]

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

Modified Files:
      Tag: SERVER_14_3
	_main.cpp 
Log Message:
Commited to: SERVER_14_3_RN and SERVER_CURRENT_RN

Synopsis:
=========
Fixes: move RTMP logs behind RTP logs in RSS

Branch: SERVER_14_3_RN and SERVER_CURRENT_RN

Reviewed by: Chytanya

Description:
============
Change logs in RSS form

Helix Live Reception: Feeds 0, 0.00 Kbps, Packets 0, Lost 0, Lost Upstream 0 
Helix Live Reception: Resends 0, Out of Order 0, Duplicate 0, Late 0 
RTMP Live Reception: Feeds 0, 0.00 Kbps, Packets 0 
RTP Live Reception: Feeds 0, 0.00 Kbps, Packets 0, Lost 0, Lost Upstream 0 
RTP Live Reception: Resends 0, Out of Order 0, Duplicate 0, Late 0

To 

Helix Live Reception: Feeds 1, 82.67 Kbps, Packets 2166, Lost 0, Lost Upstream 0 
Helix Live Reception: Resends 0, Out of Order 0, Duplicate 0, Late 0 
RTP Live Reception: Feeds 0, 0.00 Kbps, Packets 0, Lost 0, Lost Upstream 0 
RTP Live Reception: Resends 0, Out of Order 0, Duplicate 0, Late 0 
RTMP Live Reception: Feeds 0, 0.00 Kbps, Packets 0

Files affected:
===============
server/engine/core/_main.cpp

Testing Performed:
================
Unit Tests:
Start Helix server, logs in RSS is like:

Helix Live Reception: Feeds 1, 82.67 Kbps, Packets 2166, Lost 0, Lost Upstream 0 
Helix Live Reception: Resends 0, Out of Order 0, Duplicate 0, Late 0 
RTP Live Reception: Feeds 0, 0.00 Kbps, Packets 0, Lost 0, Lost Upstream 0 
RTP Live Reception: Resends 0, Out of Order 0, Duplicate 0, Late 0
RTMP Live Reception: Feeds 0, 0.00 Kbps, Packets 0

Integration Tests:
None

Leak Tests: None
Performance Tests: N/A

Platforms Tested: win-x86-vc10 Builds Verified: win-x86-vc10

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



Index: _main.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/_main.cpp,v
retrieving revision 1.210
retrieving revision 1.210.2.1
diff -u -d -r1.210 -r1.210.2.1
--- _main.cpp	18 Nov 2011 01:31:57 -0000	1.210
+++ _main.cpp	22 Dec 2011 07:36:59 -0000	1.210.2.1
@@ -3449,30 +3449,6 @@
         pBufPointer += sprintf(pBufPointer, "    Helix Live Reception: Inactive\n");
     }
 
-    if (pServerInfo->m_pRTMPLiveStats)
-    {
-        UINT32 uBytesRcvd;
-        UINT32 uPacketsRcvd;
-        
-        BrcvStatistics* bs = pServerInfo->m_pRTMPLiveStats;
-
-        uPacketsRcvd = \
                ServerInfo::CounterDifference(&(m_LastRTMPLiveStats.m_uPacketsRcvd),
-                                                     bs->m_uPacketsRcvd);
-        uBytesRcvd = \
                ServerInfo::CounterDifference(&(m_LastRTMPLiveStats.m_uBytesRcvd),
-                                                   bs->m_uBytesRcvd);
-        
-        scale = uBytesRcvd * 8.0 / timediff / 1000.0;
-
-        pBufPointer += sprintf(pBufPointer, "    RTMP Live Reception: Feeds %lu, \
                %0.2f Kbps, Packets %lu\n",
-            (unsigned long)bs->m_uReceiverSessions,
-            scale,
-            (unsigned long)uPacketsRcvd);
-    }
-    else
-    {
-        pBufPointer += sprintf(pBufPointer, "    RTMP Live Reception: Inactive\n");
-    }
-
     if (pServerInfo->m_pRTPLiveStats)
     {
         UINT32 uBytesRcvd;
@@ -3522,6 +3498,30 @@
         pBufPointer += sprintf(pBufPointer, "    RTP Live Reception: Inactive\n");
     }
 
+    if (pServerInfo->m_pRTMPLiveStats)
+    {
+        UINT32 uBytesRcvd;
+        UINT32 uPacketsRcvd;
+        
+        BrcvStatistics* bs = pServerInfo->m_pRTMPLiveStats;
+
+        uPacketsRcvd = \
ServerInfo::CounterDifference(&(m_LastRTMPLiveStats.m_uPacketsRcvd), +                \
bs->m_uPacketsRcvd); +        uBytesRcvd = \
ServerInfo::CounterDifference(&(m_LastRTMPLiveStats.m_uBytesRcvd), +                  \
bs->m_uBytesRcvd); +        
+        scale = uBytesRcvd * 8.0 / timediff / 1000.0;
+
+        pBufPointer += sprintf(pBufPointer, "    RTMP Live Reception: Feeds %lu, \
%0.2f Kbps, Packets %lu\n", +            (unsigned long)bs->m_uReceiverSessions,
+            scale,
+            (unsigned long)uPacketsRcvd);
+    }
+    else
+    {
+        pBufPointer += sprintf(pBufPointer, "    RTMP Live Reception: Inactive\n");
+    }
+
     if (pServerInfo->m_pBroadcastDistStats)
     {
         UINT32 uBytesSent;


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