[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] log/tmplgpln base_log.cpp, 1.66, 1.67 clientstats_log.cpp, 1.51, 1.52 tmplgpln.cpp, 1.2
From: mingda () helixcommunity ! org
Date: 2013-11-21 8:48:46
[Download RAW message or body]
Update of /cvsroot/server/log/tmplgpln
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv24238/server/log/tmplgpln
Modified Files:
base_log.cpp clientstats_log.cpp tmplgpln.cpp wildcard_log.cpp
rtspevents_log.cpp legacy_access_log.cpp error_log.cpp
interval_log.cpp
Log Message:
ommitted to: SERVER_CURRENT_RN, SERVER_15_1_0_RN
Reviewed by: Richard
Verification Build:
http://mag-build.prognet.com/~build/report.cgi?id=11042
Synopsis:
=========
fix vhost memory leak
Branch: HEAD
Suggested Reviewers: anyone
Description:
============
fix vhost memory leak
Files affected:
===============
common/lang/xml/xmlconfig.cpp
server/common/util/plgnhand.cpp
server/common/util/mphandle.cpp
server/common/util/logoutputs.cpp
server_rn/common/util/vhostapi.cpp
server_rn/common/util/drmpathmap.cpp
server_rn/common/util/m3uutil.cpp
server/engine/core/rssmgr.cpp
server/log/tmplgpln/base_log.cpp
server/log/tmplgpln/clientstats_log.cpp
server/log/tmplgpln/tmplgpln.cpp
server/log/tmplgpln/wildcard_log.cpp
server/log/tmplgpln/rtspevents_log.cpp
server/log/tmplgpln/legacy_access_log.cpp
server/log/tmplgpln/error_log.cpp
server/log/tmplgpln/interval_log.cpp
server_rn /datatype/dashstrmhdl/dashmp4streamhandler.cpp
server_rn/datatype/dashpln/dashpln.cpp
server_rn/datatype/mpeg2ts/mpeg2tsplin.cpp
server_rn/common/dashutil/dashutil.cpp
sds/security/dauccfg.cpp
sds/security/daucplin.cpp
server-restricted/fs/encfs/encfobj.cpp
server_rn/broadcast/transport/mpeg2ts/recv/mp2tspln.cpp
filesystem/local/full/smplfsys.cpp
server/qos/core/uasconfigtree.cpp
server/engine/config/uasconfig.cpp
server/engine/dataflow/fsmanager.cpp
server-restricted/broadcast/transport/bcng/send-local/bdstplin.cpp
Testing Performed:
================
Unit Tests:
None
Integration Tests:
Leak Tests: None
Performance Tests: N/A
Platforms Tested: Windows
Builds Verified: Windows
QA Hints
========
None.
Index: rtspevents_log.cpp
===================================================================
RCS file: /cvsroot/server/log/tmplgpln/rtspevents_log.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rtspevents_log.cpp 29 Jan 2007 23:57:54 -0000 1.4
+++ rtspevents_log.cpp 21 Nov 2013 08:48:43 -0000 1.5
@@ -314,6 +314,7 @@
SetFormatRegId(ulID);
}
}
+ HX_RELEASE(pBuffer);
break;
@@ -328,6 +329,7 @@
ReadOutputs(pArgsTemp, ulID);
}
}
+ HX_RELEASE(pArgsTemp);
break;
}
Index: wildcard_log.cpp
===================================================================
RCS file: /cvsroot/server/log/tmplgpln/wildcard_log.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- wildcard_log.cpp 24 Nov 2010 22:39:03 -0000 1.10
+++ wildcard_log.cpp 21 Nov 2013 08:48:43 -0000 1.11
@@ -844,6 +844,7 @@
SetAddFormat(pTempBuffer);
}
SetAddFormatModified(FALSE);
+ HX_RELEASE(pTempBuffer);
}
if (IsDelFormatModified())
@@ -854,6 +855,7 @@
SetDelFormat(pTempBuffer);
}
SetDelFormatModified(FALSE);
+ HX_RELEASE(pTempBuffer);
}
return HXR_OK;
Index: error_log.cpp
===================================================================
RCS file: /cvsroot/server/log/tmplgpln/error_log.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- error_log.cpp 3 Jun 2013 10:12:02 -0000 1.7
+++ error_log.cpp 21 Nov 2013 08:48:43 -0000 1.8
@@ -288,6 +288,7 @@
ReadOutputs(pArgsTemp, ulID);
}
}
+ HX_RELEASE(pArgsTemp);
break;
}
Index: clientstats_log.cpp
===================================================================
RCS file: /cvsroot/server/log/tmplgpln/clientstats_log.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- clientstats_log.cpp 11 Sep 2013 10:49:20 -0000 1.51
+++ clientstats_log.cpp 21 Nov 2013 08:48:43 -0000 1.52
@@ -538,6 +538,7 @@
}
}
+ HX_RELEASE(pBuffer);
break;
@@ -552,6 +553,7 @@
ReadOutputs(pArgsTemp, ulID);
}
}
+ HX_RELEASE(pArgsTemp);
break;
}
@@ -688,6 +690,7 @@
{
SetInterval(pTempBuffer);
}
+ HX_RELEASE(pTempBuffer);
break;
@@ -715,6 +718,7 @@
SetDisconnectFormat(pTempBuffer);
}
SetDisconnectFormatModified(FALSE);
+ HX_RELEASE(pTempBuffer);
}
if (IsTimerFormatModified())
@@ -725,6 +729,7 @@
SetTimerFormat(pTempBuffer);
}
SetTimerFormatModified(FALSE);
+ HX_RELEASE(pTempBuffer);
}
return HXR_OK;
Index: tmplgpln.cpp
===================================================================
RCS file: /cvsroot/server/log/tmplgpln/tmplgpln.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- tmplgpln.cpp 19 Jun 2013 07:14:51 -0000 1.27
+++ tmplgpln.cpp 21 Nov 2013 08:48:43 -0000 1.28
@@ -258,6 +258,8 @@
IfFailGo(hr = pBuffer->Set((UCHAR*)szTemplateName, strlen((const char*)szTemplateName) + 1));
pLog->SetName(pBuffer);
+
+ HX_RELEASE(pBuffer);
return HXR_OK;
Index: base_log.cpp
===================================================================
RCS file: /cvsroot/server/log/tmplgpln/base_log.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- base_log.cpp 10 Sep 2013 03:40:06 -0000 1.66
+++ base_log.cpp 21 Nov 2013 08:48:43 -0000 1.67
@@ -131,6 +131,32 @@
CTBaseLog::~CTBaseLog()
{
+ if (m_pOutputs)
+ {
+ CTLOutput* pOutput = NULL;
+
+ while (!m_pOutputs->empty())
+ {
+ pOutput = (CTLOutput*)m_pOutputs->remove_head();
+ HX_RELEASE(pOutput);
+ }
+
+ HX_DELETE(m_pOutputs);
+ }
+
+ HX_VECTOR_DELETE(m_pOutputString);
+
+ HX_RELEASE(m_pFormat);
+ HX_RELEASE(m_pOldFormat);
+
+ HX_RELEASE(m_pContext);
+ HX_RELEASE(m_pRegistry);
+ HX_RELEASE(m_pNetSvcs);
+ HX_RELEASE(m_pCCF);
+ HX_RELEASE(m_pErr);
+ HX_RELEASE(m_pTSScheduler);
+ HX_RELEASE(m_pScheduler);
+ HX_RELEASE(m_pName);
}
@@ -554,6 +580,7 @@
ulId,
szOutputType);
+ HX_RELEASE(pOutputKey);
if (pOutputTemp)
{
AddOutput(pOutputTemp);
@@ -676,6 +703,8 @@
pTemp->Init(m_pContext);
pOutput = (CTLOutput*)pTemp;
}
+ HX_RELEASE(pFilename);
+ HX_RELEASE(pRollTime);
DELETE_FAST_TEMP_STR(pFilenameKey);
DELETE_FAST_TEMP_STR(pRollSizeKey);
@@ -751,6 +780,7 @@
pOutput = (CTLOutput*)pTemp;
}
+ HX_RELEASE(pCommand);
DELETE_FAST_TEMP_STR(pCommandKey);
}
@@ -793,6 +823,7 @@
HX_RELEASE(pTemp);
}
}
+ HX_RELEASE(pDest);
DELETE_FAST_TEMP_STR(pPortKey);
DELETE_FAST_TEMP_STR(pDestKey);
@@ -835,6 +866,7 @@
HX_RELEASE(pTemp);
}
}
+ HX_RELEASE(pDest);
DELETE_FAST_TEMP_STR(pPortKey);
DELETE_FAST_TEMP_STR(pDestKey);
@@ -879,6 +911,7 @@
HX_RELEASE(pTemp);
}
}
+ HX_RELEASE(pDest);
DELETE_FAST_TEMP_STR(pPortKey);
DELETE_FAST_TEMP_STR(pDestKey);
@@ -923,6 +956,7 @@
}
}
+ HX_RELEASE(pDest);
DELETE_FAST_TEMP_STR(pPortKey);
DELETE_FAST_TEMP_STR(pDestKey);
@@ -995,6 +1029,8 @@
pOutput = (CTLOutput*)pTemp;
}
+ HX_RELEASE(pPriority);
+ HX_RELEASE(pIdent);
DELETE_FAST_TEMP_STR(pIdentKey);
DELETE_FAST_TEMP_STR(pPriorityKey)
@@ -1050,6 +1086,7 @@
}
}
+ HX_RELEASE(pPriority);
DELETE_FAST_TEMP_STR(pPriorityKey);
}
#endif
@@ -2568,6 +2605,7 @@
szPropName);
}
+ HX_RELEASE(pArgsTemp);
break;
}
@@ -2790,6 +2828,7 @@
hrOutput = pOutputTemp->GetNextPropertyULONG32(szOutputPropName,
ulOutputId);
}
+ HX_RELEASE(pOutputTemp);
hr = pValueTemp->GetNextPropertyULONG32(szPropName, ulId);
}
@@ -2907,6 +2946,7 @@
}
SetFormatModified(FALSE);
}
+ HX_RELEASE(pTempBuffer);
return HXR_OK;
Index: interval_log.cpp
===================================================================
RCS file: /cvsroot/server/log/tmplgpln/interval_log.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- interval_log.cpp 31 Jan 2007 21:16:50 -0000 1.9
+++ interval_log.cpp 21 Nov 2013 08:48:43 -0000 1.10
@@ -349,6 +349,7 @@
{
SetupStaticWatches(pWatchList);
}
+ HX_RELEASE(pWatchList);
}
ScheduleNextPeriodicOutput();
@@ -827,7 +828,7 @@
SetMaxInterval(pBuffer);
SetMaxIntervalRegId(ulID);
}
-
+ HX_RELEASE(pBuffer);
}
break;
@@ -849,6 +850,7 @@
ReadOutputs(pArgsTemp, ulID);
}
}
+ HX_RELEASE(pArgsTemp);
break;
}
@@ -953,6 +955,7 @@
SetFormat(pTempBuffer);
}
SetFormatModified(FALSE);
+ HX_RELEASE(pTempBuffer);
}
if (IsIntervalModified())
@@ -968,6 +971,7 @@
{
SetInterval(pTempBuffer);
}
+ HX_RELEASE(pTempBuffer);
break;
@@ -1000,6 +1004,7 @@
{
SetMinInterval(pTempBuffer);
}
+ HX_RELEASE(pTempBuffer);
break;
case PT_INTEGER:
@@ -1030,6 +1035,7 @@
{
SetMaxInterval(pTempBuffer);
}
+ HX_RELEASE(pTempBuffer);
break;
case PT_INTEGER:
Index: legacy_access_log.cpp
===================================================================
RCS file: /cvsroot/server/log/tmplgpln/legacy_access_log.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- legacy_access_log.cpp 3 Jun 2013 10:12:02 -0000 1.13
+++ legacy_access_log.cpp 21 Nov 2013 08:48:43 -0000 1.14
@@ -311,6 +311,7 @@
(const char*)m_pName->GetBuffer());
}
+ HX_RELEASE(pArgsTemp);
}
else
{
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic