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

List:       helix-server-cvs
Subject:    [Server-cvs] engine/dataflow ppm.cpp, 1.146,
From:       juanitomoore () helixcommunity ! org
Date:       2011-07-12 23:08:45
Message-ID: 201107122308.p6CN8rPk011463 () mailer ! progressive-comp ! com
[Download RAW message or body]

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

Modified Files:
	ppm.cpp pushpacketflow.cpp 
Log Message:
Synopsis
========
Add counter code for PPM vs MDP and counters for RDT vs RTP.

Branches: HEAD
Reviewer: Dean

Description
===========
Add counter code for each to server_info.cpp/.h.
In constructors and destructors of PPM::Session::Session()
and PushPacketFlow::PushPacketFlow(), put counters. 

For RDT vs RTP, use the same mechanism as for UDP counters.
Show the result in _main.cpp as

RTSP Connections: n% MDP, n% RTP, n% RDT
 
Files Affected
==============
server/engine/core/_main.cpp
server/engine/core/server_info.cpp
server/engine/core/pub/server_info.h
server/protocol/rtsp/transportparams.cpp
server/protocol/transport/common/transport.cpp
server/protocol/transport/common/pub/transport.h
server/protocol/transport/rdt/rdt_base.cpp
server/include/hxservinfo.h
server/engine/core/_main.cpp
server/engine/dataflow/ppm.cpp
server/engine/dataflow/pushpacketflow.cpp

Testing Performed
=================
Unit Tests: - N/A
Integration Tests: Ran with helixsim showing MDP percentage.
In clientsession.cpp, I alternated the license for MDP off and on
and got 50% MDP. For RTP vs RDT, I showed that we use 100% RDT for
realvideo10.rm.
Leak Tests: - N/A
Performance Tests: -N/A
Platforms Tested: linux-rhel5-x86_64
Builds Verified: linux-rhel5-x86_64

QA Hints
========
To force some clients to use PPM instead of MDP, alter license.


Index: ppm.cpp
===================================================================
RCS file: /cvsroot/server/engine/dataflow/ppm.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- ppm.cpp	9 Jul 2011 16:26:29 -0000	1.146
+++ ppm.cpp	12 Jul 2011 23:08:42 -0000	1.147
@@ -1679,11 +1679,14 @@
     HXTimeval hxt = m_pAccurateClock->GetTimeOfDay();
     m_tvRTSPPlayTime.tv_sec = hxt.tv_sec;
     m_tvRTSPPlayTime.tv_usec = hxt.tv_usec;
+
+    m_pProc->pc->server_info->IncrementPPMCount(m_pProc);
 }
 
 PPM::Session::~Session()
 {
     if (!m_bIsDone) Done();
+    m_pProc->pc->server_info->DecrementPPMCount(m_pProc);
 }
 
 STDMETHODIMP

Index: pushpacketflow.cpp
===================================================================
RCS file: /cvsroot/server/engine/dataflow/pushpacketflow.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pushpacketflow.cpp	22 Oct 2010 21:21:14 -0000	1.7
+++ pushpacketflow.cpp	12 Jul 2011 23:08:42 -0000	1.8
@@ -157,6 +157,8 @@
     memset(m_pResendRead, 0, sizeof(UINT8) * m_unStreamCount);
     memset(m_pbPausedStreams, 0, sizeof(BOOL) * m_unStreamCount);
     memset(m_pBlockQueue, 0, sizeof(ServerPacket*) * m_unStreamCount);
+
+    m_pProc->pc->server_info->IncrementMDPCount(m_pProc);
 }
 
 PushPacketFlow::~PushPacketFlow()
@@ -210,6 +212,8 @@
     HX_VECTOR_DELETE(m_pBlockQueue);
 
     HX_DELETE(m_pSessionAggrLinkCharParams);
+
+    m_pProc->pc->server_info->DecrementMDPCount(m_pProc);
 }
 
 STDMETHODIMP


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