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

List:       helix-server-cvs
Subject:    [Server-cvs] qos/transport qos_tran_cc.cpp, 1.108, 1.108.18.1 qos_tran_loss_event.cpp, 1.4,
From:       dcollins () helixcommunity ! org
Date:       2012-05-25 19:16:21
[Download RAW message or body]

Update of /cvsroot/server/qos/transport
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10923/qos/transport

Modified Files:
      Tag: SERVER_NUCLEUS
	qos_tran_cc.cpp qos_tran_loss_event.cpp 
	qos_tran_rdt_metrics.cpp 
Log Message:
use HX_MIN() rather than min() for better portability


Index: qos_tran_cc.cpp
===================================================================
RCS file: /cvsroot/server/qos/transport/qos_tran_cc.cpp,v
retrieving revision 1.108
retrieving revision 1.108.18.1
diff -u -d -r1.108 -r1.108.18.1
--- qos_tran_cc.cpp	2 Jul 2010 14:40:42 -0000	1.108
+++ qos_tran_cc.cpp	25 May 2012 19:16:18 -0000	1.108.18.1
@@ -1124,7 +1124,7 @@
     }
     // else ulMaxStreamRate is 0 so we return the media rate.
 
-    return (ulMaxStreamRate >= m_ulMediaRate) ? min(ulMaxStreamRate, \
(UINT32)(m_ulMediaRate * m_fInitialOversendRate)) +    return (ulMaxStreamRate >= \
m_ulMediaRate) ? HX_MIN(ulMaxStreamRate, (UINT32)(m_ulMediaRate * \
m_fInitialOversendRate))  : m_ulMediaRate;
 }
 

Index: qos_tran_rdt_metrics.cpp
===================================================================
RCS file: /cvsroot/server/qos/transport/qos_tran_rdt_metrics.cpp,v
retrieving revision 1.16
retrieving revision 1.16.40.1
diff -u -d -r1.16 -r1.16.40.1
--- qos_tran_rdt_metrics.cpp	31 May 2009 03:40:05 -0000	1.16
+++ qos_tran_rdt_metrics.cpp	25 May 2012 19:16:18 -0000	1.16.40.1
@@ -175,7 +175,7 @@
         /* Loss Metric: The computed value is useless for TFRC, but it is ok for \
                session stats: */
         double fLocalLoss = (double)((double)m_ulLocalLossAcc / \
(double)(ackLen+m_ulLocalLossAcc));  
-        m_fLossRate = min(fLocalLoss, (double)((double)(m_ulLossAcc) / \
(double)(m_ulPktAcc))); +        m_fLossRate = HX_MIN(fLocalLoss, \
(double)((double)(m_ulLossAcc) / (double)(m_ulPktAcc)));  
         /* Rate Metric: */
         for (UINT16 i = 0; i < ackLen; i++)

Index: qos_tran_loss_event.cpp
===================================================================
RCS file: /cvsroot/server/qos/transport/qos_tran_loss_event.cpp,v
retrieving revision 1.4
retrieving revision 1.4.358.1
diff -u -d -r1.4 -r1.4.358.1
--- qos_tran_loss_event.cpp	7 Oct 2003 18:55:52 -0000	1.4
+++ qos_tran_loss_event.cpp	25 May 2012 19:16:18 -0000	1.4.358.1
@@ -178,7 +178,7 @@
 
     fIntervalAvg_1 /= fWeightTotal_1;
     
-    fLossRate = (1.0 / max(fIntervalAvg_0, fIntervalAvg_1));
+    fLossRate = (1.0 / HX_MAX(fIntervalAvg_0, fIntervalAvg_1));
     return HXR_OK;
 }
 
@@ -249,7 +249,7 @@
     //from draft-ietf-tsvwg-tfrc-03
     double fRTT_seconds = fRTTEstimate / 1000;
     double fRTO_seconds = fRTOEstimate / 1000;
-    double fTemp        = min(3 * sqrt(3*ACKED_PKTS_PER_ACK*fLossEventRate/8), 
+    double fTemp        = HX_MIN(3 * sqrt(3*ACKED_PKTS_PER_ACK*fLossEventRate/8), 
 			      1.0);
     return ( fAvgPktSize /
 	     


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