[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs]
From: dcollins () helixcommunity ! org
Date: 2011-10-29 20:51:19
[Download RAW message or body]
Update of /cvsroot/server/broadcast/transport/rtp/recv
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv28238
Modified Files:
Tag: DEAN_PERF_2011_10_17
rtpbcstreams.cpp rtpreceiver.cpp rtpworkercb.cpp
Log Message:
experimental DEAN_PERF_2011_10_17 branch checkin: debug printf cleanup, misc safety \
checks
Index: rtpbcstreams.cpp
===================================================================
RCS file: /cvsroot/server/broadcast/transport/rtp/recv/Attic/rtpbcstreams.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- rtpbcstreams.cpp 28 Oct 2011 21:45:40 -0000 1.1.2.2
+++ rtpbcstreams.cpp 29 Oct 2011 20:51:09 -0000 1.1.2.3
@@ -698,7 +698,7 @@
{
// printf("StartBuffering...\n");
- RTPDPRINTF(B_INFO, ("StartBuffering... (RTP Live thread ID # %d, TID=%llu)\n", \
g_TLS_RTPThreadID, MyOSThreadID())); + RTPDPRINTF(B_INFO, ("StartBuffering... \
(RTPLive thread ID # %d)\n", g_TLS_RTPThreadID));
///Get Origin Address String from FileHeader (Session Level)
IHXBuffer* pBufOriginAddr = NULL;
@@ -821,8 +821,8 @@
STDMETHODIMP
RTPBCStreamsObject::PacketsStarted(UINT16 unStreamNum)
{
- RTPDPRINTF(B_INFO, ("PacketsStarted(%d)... (RTP Live thread ID # %d, \
TID=%llu)\n",
- unStreamNum, g_TLS_RTPThreadID, MyOSThreadID()));
+ RTPDPRINTF(B_INFO, ("PacketsStarted(%d)... (RTP Live thread ID # %d)\n",
+ unStreamNum, g_TLS_RTPThreadID));
++m_uiNumStreamsStarted;
@@ -1110,7 +1110,7 @@
HX_RESULT
RTPBCStreamsObject::GetFileHeader(void)
{
- RTPDPRINTF(B_INFO, ("RTPBCStreamsObject::GetFileHeader called in thread %llu\n", \
MyOSThreadID())); + RTPDPRINTF(B_INFO, ("RTPBCStreamsObject::GetFileHeader \
called\n"));
IHXValues* pHeader = m_pFileHeader;
HX_ADDREF(pHeader);
@@ -1149,7 +1149,7 @@
HX_RESULT
RTPBCStreamsObject::GetStreamHeader(UINT16 unStreamNumber)
{
- RTPDPRINTF(B_INFO, ("RTPBCStreamsObject::GetStreamHeader called in thread \
%llu\n", MyOSThreadID())); + RTPDPRINTF(B_INFO, \
("RTPBCStreamsObject::GetStreamHeader called\n"));
IHXValues* pHeader = m_ppStreamHeaders[unStreamNumber];
HX_ADDREF(pHeader);
@@ -1197,7 +1197,7 @@
pPath = "(pathname unknown)";
}
NEW_FAST_TEMP_STR(szMsg, 1024, 256+strlen(pErrText)+strlen(pPath)+1);
- sprintf(szMsg, "RTPLive/%llu: %s: %s\n", MyOSThreadID(), pPath, pErrText);
+ sprintf(szMsg, "RTPLive/%llu: %s: %s\n", g_TLS_RTPProcNum, pPath, pErrText);
IHXErrorMessages* pErrMsg = NULL;
if (m_pContext)
@@ -1364,7 +1364,7 @@
void
RTPBCStreamsObject::StopAllStreams(HXBOOL bFlushPkts/*=TRUE*/)
{
- RTPDPRINTF(B_INFO, ("RTPBCStreamsObject::StopAllStreams called in thread \
%llu\n", MyOSThreadID())); + RTPDPRINTF(B_INFO, \
("RTPBCStreamsObject::StopAllStreams called\n"));
if (m_bStreamsStopping)
{
@@ -1539,7 +1539,7 @@
HX_RESULT
RTPBCStreamsObject::StartPackets(UINT16 unStreamNumber)
{
- RTPDPRINTF(B_INFO, ("RTPBCStreamsObject::StartPackets called in thread %llu\n", \
MyOSThreadID())); + RTPDPRINTF(B_INFO, ("RTPBCStreamsObject::StartPackets \
called\n"));
if (m_bStreamsStopping)
{
Index: rtpworkercb.cpp
===================================================================
RCS file: /cvsroot/server/broadcast/transport/rtp/recv/Attic/rtpworkercb.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- rtpworkercb.cpp 28 Oct 2011 21:45:41 -0000 1.1.2.4
+++ rtpworkercb.cpp 29 Oct 2011 20:51:09 -0000 1.1.2.5
@@ -75,13 +75,13 @@
, m_pRealResponse(pRealResponse)
, m_ulManagerThreadID(ulManagerThreadID)
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPWorkerResponseWrapper::RTPWorkerResponseWrapper()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPWorkerResponseWrapper constructor this=%p\n", this)); \
HX_ADDREF(m_pRealResponse); }
RTPWorkerResponseWrapper::~RTPWorkerResponseWrapper()
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPWorkerResponseWrapper::~RTPWorkerResponseWrapper()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPWorkerResponseWrapper destructor this=%p\n", this)); \
HX_RELEASE(m_pRealResponse); }
@@ -223,16 +223,17 @@
SDPFileAddedCallback::Func()
{
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
+ RTPDPRINTF(B_THREAD, ("SDPFileAddedCallback::Func() called! PATH=%s this=%p\n",
+ m_pFileName, this));
- const char* pPath = NULL;
-
- RTPDPRINTF(B_THREAD, ("SDPFileAddedCallback::Func() called! PATH=%s \
TID=%llu\n",
- m_pFileName, MyOSThreadID()));
-
- // Relay the SDP file up the RTPBFF, which will hand it to
- // a RTPBCObj to process.
- GlobalRTPBroadcastFormat()->SDPFileAdded(m_pFileName);
- HX_DELETE(m_pFileName);
+ // Process the request here in the worker thread.
+ if (g_TLS_RTPThreadType == RTP_THR_WORKER)
+ {
+ // Relay the SDP file up the RTPBFF, which will hand it to
+ // a RTPBCObj to process.
+ GlobalRTPBroadcastFormat()->SDPFileAdded(m_pFileName);
+ HX_DELETE(m_pFileName);
+ }
return HXR_OK;
}
@@ -285,13 +286,13 @@
: m_lRefCount(0)
, m_pFileName(pFileName)
{
- RTPDPRINTF(B_CONS, ("%p: SDPFileAddedCallback constructor()\n", this));
+ RTPDPRINTF(B_CONS, ("SDPFileAddedCallback constructor this=%p\n", this));
HX_ASSERT(m_pFileName);
}
SDPFileAddedCallback::~SDPFileAddedCallback()
{
- RTPDPRINTF(B_CONS, ("%p: SDPFileAddedCallback destructor()\n", this));
+ RTPDPRINTF(B_CONS, ("SDPFileAddedCallback destructor this=%p\n", this));
HX_DELETE(m_pFileName);
}
@@ -310,13 +311,15 @@
StartPacketsCallback::Func()
{
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
-
- RTPDPRINTF(B_THREAD, ("StartPacketsCallback::Func() called! OBJ=%p NUM=%d \
TID=%llu\n",
- m_pStreamsObject, m_unStreamNumber, MyOSThreadID()));
+ RTPDPRINTF(B_THREAD, ("StartPacketsCallback::Func() called! this=%p OBJ=%p \
NUM=%d\n", + this, m_pStreamsObject, m_unStreamNumber));
// Process the request here in the worker thread.
- m_pStreamsObject->StartPackets(m_unStreamNumber);
- HX_RELEASE(m_pStreamsObject);
+ if (g_TLS_RTPThreadType == RTP_THR_WORKER)
+ {
+ m_pStreamsObject->StartPackets(m_unStreamNumber);
+ HX_RELEASE(m_pStreamsObject);
+ }
return HXR_OK;
}
@@ -371,14 +374,14 @@
, m_pStreamsObject(pStreamsObject)
, m_unStreamNumber(unStreamNumber)
{
- RTPDPRINTF(B_CONS, ("%p: StartPacketsCallback constructor()\n", this));
+ RTPDPRINTF(B_CONS, ("StartPacketsCallback constructor this=%p\n", this));
HX_ASSERT(m_pStreamsObject);
HX_ADDREF(m_pStreamsObject);
}
StartPacketsCallback::~StartPacketsCallback()
{
- RTPDPRINTF(B_CONS, ("%p: StartPacketsCallback destructor()\n", this));
+ RTPDPRINTF(B_CONS, ("StartPacketsCallback destructor this=%p\n", this));
HX_RELEASE(m_pStreamsObject);
}
@@ -395,13 +398,15 @@
StopAllStreamsCallback::Func()
{
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
-
- RTPDPRINTF(B_THREAD, ("StopAllStreamsCallback::Func() called! OBJ=%p FLUSH=%d \
TID=%llu\n",
- m_pStreamsObject, m_bFlushPackets, MyOSThreadID()));
+ RTPDPRINTF(B_THREAD, ("StopAllStreamsCallback::Func() called! this=%p OBJ=%p \
FLUSH=%d\n", + this, m_pStreamsObject, m_bFlushPackets));
// Process the request here in the worker thread.
- m_pStreamsObject->StopAllStreams(m_bFlushPackets);
- HX_RELEASE(m_pStreamsObject);
+ if (g_TLS_RTPThreadType == RTP_THR_WORKER)
+ {
+ m_pStreamsObject->StopAllStreams(m_bFlushPackets);
+ HX_RELEASE(m_pStreamsObject);
+ }
return HXR_OK;
}
@@ -456,14 +461,14 @@
, m_pStreamsObject(pStreamsObject)
, m_bFlushPackets(bFlushPackets)
{
- RTPDPRINTF(B_CONS, ("%p: StopAllStreamsCallback constructor()\n", this));
+ RTPDPRINTF(B_CONS, ("StopAllStreamsCallback constructor this=%p\n", this));
HX_ASSERT(m_pStreamsObject);
HX_ADDREF(m_pStreamsObject);
}
StopAllStreamsCallback::~StopAllStreamsCallback()
{
- RTPDPRINTF(B_CONS, ("%p: StopAllStreamsCallback destructor()\n", this));
+ RTPDPRINTF(B_CONS, ("StopAllStreamsCallback destructor this=%p\n", this));
HX_RELEASE(m_pStreamsObject);
}
@@ -482,7 +487,7 @@
, m_pStreamsObject(pStreamsObject)
, m_pResponseWrapper(pWrapper)
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPInitBroadcastCallback::RTPInitBroadcastCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPInitBroadcastCallback constructor this=%p\n", this)); \
HX_ASSERT(m_pFileName); HX_ASSERT(m_pStreamsObject);
HX_ASSERT(m_pResponseWrapper);
@@ -493,7 +498,7 @@
RTPInitBroadcastCallback::~RTPInitBroadcastCallback()
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPInitBroadcastCallback::~RTPInitBroadcastCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPInitBroadcastCallback destructor this=%p\n", this)); \
HX_RELEASE(m_pStreamsObject); HX_RELEASE(m_pResponseWrapper);
HX_DELETE(m_pFileName);
@@ -505,19 +510,20 @@
STDMETHODIMP
RTPInitBroadcastCallback::Func()
{
- HX_RESULT res = HXR_OK;
-
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
+ RTPDPRINTF(B_THREADV, ("RTPInitBroadcastCallback::Func() called! this=%p \
PATH=%s\n", + this, m_pFileName));
- RTPDPRINTF(B_THREADV, ("RTPInitBroadcastCallback::Func() called! PATH=%s \
TID=%llu\n",
- m_pFileName, MyOSThreadID()));
-
- IHXFormatResponse* pResp = NULL;
- m_pResponseWrapper->QueryInterface(IID_IHXFormatResponse, (void **)&pResp);
- m_pStreamsObject->Init(pResp);
- HX_RELEASE(pResp);
+ // Process the request here in the worker thread.
+ if (g_TLS_RTPThreadType == RTP_THR_WORKER)
+ {
+ IHXFormatResponse* pResp = NULL;
+ m_pResponseWrapper->QueryInterface(IID_IHXFormatResponse, (void **)&pResp);
+ m_pStreamsObject->Init(pResp);
+ HX_RELEASE(pResp);
+ }
- return res;
+ return HXR_OK;
}
/************************************************************************
@@ -573,14 +579,14 @@
, m_lStatus(status)
, m_pRealResponse(pRealResponse)
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPInitBroadcastResponseCallback::RTPInitBroadcastResponseCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPInitBroadcastResponseCallback constructor this=%p\n", this)); \
HX_ASSERT(m_pRealResponse); HX_ADDREF(m_pRealResponse);
}
RTPInitBroadcastResponseCallback::~RTPInitBroadcastResponseCallback()
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPInitBroadcastResponseCallback::~RTPInitBroadcastResponseCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPInitBroadcastResponseCallback destructor this=%p\n", this)); \
HX_RELEASE(m_pRealResponse); }
@@ -590,19 +596,17 @@
STDMETHODIMP
RTPInitBroadcastResponseCallback::Func()
{
- HX_RESULT res = HXR_OK;
-
- RTPDPRINTF(B_THREADV, ("RTPInitBroadcastResponseCallback::Func() called! \
status=%lu TID=%llu\n",
- m_lStatus, MyOSThreadID()));
-
+ HX_RESULT res = HXR_OK;
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_MANAGER);
+ RTPDPRINTF(B_THREADV, ("RTPInitBroadcastResponseCallback::Func() called! this=%p \
status=%lu\n", + this, m_lStatus));
+ // Process the request in the manager thread.
if (g_TLS_RTPThreadType == RTP_THR_MANAGER)
{
res = m_pRealResponse->InitDone(m_lStatus);
}
- HX_RELEASE(m_pRealResponse);
return res;
}
@@ -648,148 +652,6 @@
}
-#if 0
-/************************************************************************
- * RTPDoesExistCallback Methods
- *
- * Dispatches a DoesExist call to a worker.
- * If the file exists, the worker thread owns it.
- */
-RTPDoesExistCallback::RTPDoesExistCallback(UINT32 ulManagerThreadID,
- const char* pFileName,
- IHXFileExistsResponse* pResponse,
- BroadcastReceiverFeed* pFeed)
- : m_lRefCount(0)
- , m_pFileName(pFileName)
- , m_pResponse(pResponse)
- , m_bExists(FALSE)
- , m_ulManagerThreadID(ulManagerThreadID)
- , m_pFeed(pFeed)
-{
- RTPDPRINTF(B_CONS, ("%p: RTPDoesExistCallback::RTPDoesExistCallback()\n", \
this));
- HX_ASSERT(m_pFileName);
- HX_ADDREF(pResponse);
- HX_ADDREF(pFeed);
-}
-
-RTPDoesExistCallback::~RTPDoesExistCallback()
-{
- RTPDPRINTF(B_CONS, ("%p: RTPDoesExistCallback::~RTPDoesExistCallback()\n", \
this));
- HX_RELEASE(m_pFeed);
- HX_RELEASE(m_pResponse);
- HX_DELETE(m_pFileName);
-}
-
-/************************************************************************
- * IHXCallback Interface Methods ref: hxengin.h
- */
-STDMETHODIMP
-RTPDoesExistCallback::Func()
-{
- HX_RESULT res = HXR_OK;
-
- RTPDPRINTF(B_THREADV,
- ("RTPDoesExistCallback::Func() called! PATH=%s TID=%llu \
ThreadID=%lu\n",
- m_pFileName, MyOSThreadID(), (unsigned long)g_TLS_RTPThreadID));
-
- if (g_TLS_RTPThreadType == RTP_THR_WORKER)
- {
- RTPDPRINTF(B_THREADV, ("RTPDoesExistCallback:: STEP 1\n"));
- m_pFeed->InitFeed();
- res = m_pFeed->DoesExist(m_pFileName, (IHXFileExistsResponse*)this);
- }
- else // manager thread
- {
- RTPDPRINTF(B_THREADV, ("RTPDoesExistCallback:: STEP 3\n"));
-
- HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_MANAGER);
-
- HX_DELETE(m_pFileName);
- IHXFileExistsResponse* pResponse = m_pResponse;
- m_pResponse = NULL;
- pResponse->DoesExistDone(m_bExists);
- HX_RELEASE(pResponse);
- }
-
- return res;
-}
-
-/************************************************************************
- * IHXFileExistsResponse Interface Methods ref: hxfiles.h
- */
-STDMETHODIMP
-RTPDoesExistCallback::DoesExistDone(HXBOOL bExist)
-{
- RTPDPRINTF(B_THREADV, ("RTPDoesExistCallback:: STEP 2\n"));
- HX_RESULT res = HXR_OK;
-
- HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
-
- m_bExists = bExist;
-
- // XXXDC should worker-type flag be different when sending from the worker
- // to the manager?
- res = g_TLS_pWTManager->SendWorkerMessage(
- HX_WORKER_TYPE_LIVE_INGRESS, m_ulManagerThreadID, (IHXCallback*)this);
- if (FAILED(res))
- {
- HX_DELETE(m_pFileName);
- HX_RELEASE(m_pResponse);
- }
-
- return res;
-}
-
-
-/************************************************************************
- * IUnknown COM Interface Methods ref: hxcom.h
- */
-STDMETHODIMP_(ULONG32)
-RTPDoesExistCallback::AddRef()
-{
- return InterlockedIncrement(&m_lRefCount);
-}
-
-STDMETHODIMP_(ULONG32)
-RTPDoesExistCallback::Release()
-{
- if (InterlockedDecrement(&m_lRefCount) > 0)
- {
- return m_lRefCount;
- }
-
- delete this;
- return 0;
-}
-
-STDMETHODIMP
-RTPDoesExistCallback::QueryInterface(REFIID riid, void** ppvObj)
-{
- if (IsEqualIID(riid, IID_IHXCallback))
- {
- AddRef();
- *ppvObj = (IHXCallback*)this;
- return HXR_OK;
- }
- else if (IsEqualIID(riid, IID_IUnknown))
- {
- AddRef();
- *ppvObj = (IUnknown*)(IHXCallback*)this;
- return HXR_OK;
- }
- else if (IsEqualIID(riid, IID_IHXFileExistsResponse))
- {
- AddRef();
- *ppvObj = (IUnknown*)(IHXFileExistsResponse*)this;
- return HXR_OK;
- }
-
- *ppvObj = NULL;
- return HXR_NOINTERFACE;
-}
-#endif
-
-
/************************************************************************
* RTPGetFileHeaderCallback Methods
*
@@ -799,13 +661,13 @@
: m_lRefCount(0)
, m_pStreamsObject(pStreamsObject)
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPGetFileHeaderCallback::RTPGetFileHeaderCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPGetFileHeaderCallback constructor this=%p\n", this)); \
HX_ADDREF(m_pStreamsObject); }
RTPGetFileHeaderCallback::~RTPGetFileHeaderCallback()
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPGetFileHeaderCallback::~RTPGetFileHeaderCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPGetFileHeaderCallback destructor=%p\n", this)); \
HX_RELEASE(m_pStreamsObject); }
@@ -816,13 +678,15 @@
RTPGetFileHeaderCallback::Func()
{
HX_RESULT res = HXR_OK;
-
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
+ RTPDPRINTF(B_THREADV, ("RTPGetFileHeaderCallback::Func() called! this=%p\n", \
this));
- RTPDPRINTF(B_THREADV, ("RTPGetFileHeaderCallback::Func() called! TID=%llu\n",
- MyOSThreadID()));
+ // Process the request here in the worker thread.
+ if (g_TLS_RTPThreadType == RTP_THR_WORKER)
+ {
+ res = m_pStreamsObject->GetFileHeader();
+ }
- res = m_pStreamsObject->GetFileHeader();
return res;
}
@@ -881,7 +745,7 @@
, m_pHeader(pHeader)
, m_pRealResponse(pRealResponse)
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPGetFileHeaderResponseCallback::RTPGetFileHeaderResponseCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPGetFileHeaderResponseCallback constructor this=%p\n", this)); \
HX_ASSERT(m_pRealResponse); HX_ADDREF(m_pRealResponse);
HX_ADDREF(m_pHeader);
@@ -889,7 +753,7 @@
RTPGetFileHeaderResponseCallback::~RTPGetFileHeaderResponseCallback()
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPGetFileHeaderResponseCallback::~RTPGetFileHeaderResponseCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPGetFileHeaderResponseCallback destructor this=%p\n", this)); \
HX_RELEASE(m_pRealResponse); HX_RELEASE(m_pHeader);
}
@@ -901,12 +765,11 @@
RTPGetFileHeaderResponseCallback::Func()
{
HX_RESULT res = HXR_OK;
-
- RTPDPRINTF(B_THREADV, ("RTPGetFileHeaderResponseCallback::Func() called! \
status=%lu TID=%llu\n",
- m_lStatus, MyOSThreadID()));
-
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_MANAGER);
+ RTPDPRINTF(B_THREADV, ("RTPGetFileHeaderResponseCallback::Func() called! this=%p \
status=%lu\n", + this, m_lStatus));
+ // Process the request in the manager thread.
if (g_TLS_RTPThreadType == RTP_THR_MANAGER)
{
res = m_pRealResponse->FileHeaderReady(m_lStatus, m_pHeader);
@@ -969,13 +832,13 @@
, m_unStreamNumber(unStreamNumber)
, m_pStreamsObject(pStreamsObject)
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPGetStreamHeaderCallback::RTPGetStreamHeaderCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPGetStreamHeaderCallback constructor this=%p\n", this)); \
HX_ADDREF(m_pStreamsObject); }
RTPGetStreamHeaderCallback::~RTPGetStreamHeaderCallback()
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPGetStreamHeaderCallback::~RTPGetStreamHeaderCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPGetStreamHeaderCallback destructor this=%p\n", this)); \
HX_RELEASE(m_pStreamsObject); }
@@ -986,13 +849,14 @@
RTPGetStreamHeaderCallback::Func()
{
HX_RESULT res = HXR_OK;
-
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
+ RTPDPRINTF(B_THREADV, ("RTPGetStreamHeaderCallback::Func() called! this=%p\n", \
this));
- RTPDPRINTF(B_THREADV, ("RTPGetStreamHeaderCallback::Func() called! TID=%llu\n",
- MyOSThreadID()));
-
- m_pStreamsObject->GetStreamHeader(m_unStreamNumber);
+ // Process the request here in the worker thread.
+ if (g_TLS_RTPThreadType == RTP_THR_WORKER)
+ {
+ m_pStreamsObject->GetStreamHeader(m_unStreamNumber);
+ }
return res;
}
@@ -1053,7 +917,7 @@
, m_pHeader(pHeader)
, m_pRealResponse(pRealResponse)
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPGetStreamHeaderResponseCallback::RTPGetStreamHeaderResponseCallback()\n", this)); \
+ RTPDPRINTF(B_CONS, ("RTPGetStreamHeaderResponseCallback constructor this=%p\n", \
this)); HX_ASSERT(m_pRealResponse);
HX_ADDREF(m_pRealResponse);
HX_ADDREF(m_pHeader);
@@ -1061,7 +925,7 @@
RTPGetStreamHeaderResponseCallback::~RTPGetStreamHeaderResponseCallback()
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPGetStreamHeaderResponseCallback::~RTPGetStreamHeaderResponseCallback()\n", this)); \
+ RTPDPRINTF(B_CONS, ("RTPGetStreamHeaderResponseCallback destructor this=%p\n", \
this)); HX_RELEASE(m_pRealResponse);
HX_RELEASE(m_pHeader);
}
@@ -1073,18 +937,16 @@
RTPGetStreamHeaderResponseCallback::Func()
{
HX_RESULT res = HXR_OK;
-
- RTPDPRINTF(B_THREADV, ("RTPGetStreamHeaderResponseCallback::Func() called! \
status=%lu TID=%llu\n",
- m_lStatus, MyOSThreadID()));
-
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_MANAGER);
+ RTPDPRINTF(B_THREADV, ("RTPGetStreamHeaderResponseCallback::Func() called! \
this=%p status=%lu\n", + this, m_lStatus));
+ // Process the request in the manager thread.
if (g_TLS_RTPThreadType == RTP_THR_MANAGER)
{
res = m_pRealResponse->StreamHeaderReady(m_lStatus, m_pHeader);
}
- HX_RELEASE(m_pRealResponse);
return res;
}
@@ -1140,13 +1002,13 @@
, m_unStreamNumber(unStreamNumber)
, m_pStreamsObject(pStreamsObject)
{
- RTPDPRINTF(B_CONS, ("%p: RTPStartPacketsCallback::RTPStartPacketsCallback()\n", \
this)); + RTPDPRINTF(B_CONS, ("RTPStartPacketsCallback constructor this=%p\n", \
this)); HX_ADDREF(m_pStreamsObject);
}
RTPStartPacketsCallback::~RTPStartPacketsCallback()
{
- RTPDPRINTF(B_CONS, ("%p: RTPStartPacketsCallback::~RTPStartPacketsCallback()\n", \
this)); + RTPDPRINTF(B_CONS, ("RTPStartPacketsCallback destructor this=%p\n", \
this)); HX_RELEASE(m_pStreamsObject);
}
@@ -1157,13 +1019,14 @@
RTPStartPacketsCallback::Func()
{
HX_RESULT res = HXR_OK;
-
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
+ RTPDPRINTF(B_THREADV, ("RTPStartPacketsCallback::Func() called! this=%p\n", \
this));
- RTPDPRINTF(B_THREADV, ("RTPStartPacketsCallback::Func() called! TID=%llu\n",
- MyOSThreadID()));
-
- res = m_pStreamsObject->StartPackets(m_unStreamNumber);
+ // Process the request here in the worker thread.
+ if (g_TLS_RTPThreadType == RTP_THR_WORKER)
+ {
+ res = m_pStreamsObject->StartPackets(m_unStreamNumber);
+ }
return res;
}
@@ -1220,13 +1083,13 @@
, m_unStreamNumber(unStreamNumber)
, m_pStreamsObject(pStreamsObject)
{
- RTPDPRINTF(B_CONS, ("%p: RTPStopPacketsCallback::RTPStopPacketsCallback()\n", \
this)); + RTPDPRINTF(B_CONS, ("RTPStopPacketsCallback constructor this=%p\n", \
this)); HX_ADDREF(m_pStreamsObject);
}
RTPStopPacketsCallback::~RTPStopPacketsCallback()
{
- RTPDPRINTF(B_CONS, ("%p: RTPStopPacketsCallback::~RTPStopPacketsCallback()\n", \
this)); + RTPDPRINTF(B_CONS, ("RTPStopPacketsCallback destructor this=%p\n", \
this)); HX_RELEASE(m_pStreamsObject);
}
@@ -1237,13 +1100,14 @@
RTPStopPacketsCallback::Func()
{
HX_RESULT res = HXR_OK;
-
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
+ RTPDPRINTF(B_THREADV, ("RTPStopPacketsCallback::Func() called! this=%p\n", \
this));
- RTPDPRINTF(B_THREADV, ("RTPStopPacketsCallback::Func() called! TID=%llu\n",
- MyOSThreadID()));
-
- res = m_pStreamsObject->StopPackets(m_unStreamNumber);
+ // Process the request here in the worker thread.
+ if (g_TLS_RTPThreadType == RTP_THR_WORKER)
+ {
+ res = m_pStreamsObject->StopPackets(m_unStreamNumber);
+ }
return res;
}
@@ -1290,97 +1154,6 @@
}
-#if 0
-/************************************************************************
- * RTPInitReceiverCallback Methods
- *
- * Dispatches an InitReceiver call to a worker.
- */
-RTPInitReceiverCallback::RTPInitReceiverCallback(UINT32 ulManagerThreadID,
- UINT32 ulReceiverID)
- : m_lRefCount(0)
- , m_ulReceiverID(ulReceiverID)
- , m_ulManagerThreadID(ulManagerThreadID)
-{
- RTPDPRINTF(B_CONS, ("%p: RTPInitReceiverCallback::RTPInitReceiverCallback()\n", \
this));
-}
-
-RTPInitReceiverCallback::~RTPInitReceiverCallback()
-{
- RTPDPRINTF(B_CONS, ("%p: RTPInitReceiverCallback::~RTPInitReceiverCallback()\n", \
this));
-}
-
-/************************************************************************
- * IHXCallback Interface Methods ref: hxengin.h
- */
-STDMETHODIMP
-RTPInitReceiverCallback::Func()
-{
- HX_RESULT res = HXR_OK;
-
- RTPDPRINTF(B_THREADV,
- ("RTPInitReceiverCallback::Func() called! TID=%llu ThreadID=%lu\n",
- MyOSThreadID(), (unsigned long)g_TLS_RTPThreadID));
-
- if (g_TLS_RTPThreadType == RTP_THR_WORKER)
- {
- //FIXME
- #if 0
- BroadcastReceiverThread* pWorkerThread = \
BroadcastReceiverThread::GetInstance();
- pWorkerThread->InitReceiver(m_ulReceiverID);
- HX_RELEASE(pWorkerThread);
- #endif
- }
- else // manager thread
- {
- HX_ASSERT(!"RTPInitReceiverCallback::Func() in wrong thread!");
- }
-
- return res;
-}
-
-
-/************************************************************************
- * IUnknown COM Interface Methods ref: hxcom.h
- */
-STDMETHODIMP_(ULONG32)
-RTPInitReceiverCallback::AddRef()
-{
- return InterlockedIncrement(&m_lRefCount);
-}
-
-STDMETHODIMP_(ULONG32)
-RTPInitReceiverCallback::Release()
-{
- if (InterlockedDecrement(&m_lRefCount) > 0)
- {
- return m_lRefCount;
- }
-
- delete this;
- return 0;
-}
-
-STDMETHODIMP
-RTPInitReceiverCallback::QueryInterface(REFIID riid, void** ppvObj)
-{
- if (IsEqualIID(riid, IID_IHXCallback))
- {
- AddRef();
- *ppvObj = (IHXCallback*)this;
- return HXR_OK;
- }
- else if (IsEqualIID(riid, IID_IUnknown))
- {
- AddRef();
- *ppvObj = (IUnknown*)(IHXCallback*)this;
- return HXR_OK;
- }
-
- *ppvObj = NULL;
- return HXR_NOINTERFACE;
-}
-#endif
/************************************************************************
* RTPStreamDoneResponseCallback Methods
@@ -1394,14 +1167,14 @@
, m_unStreamNumber(unStreamNumber)
, m_pRealResponse(pRealResponse)
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPStreamDoneResponseCallback::RTPStreamDoneResponseCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPStreamDoneResponseCallback constructor this=%p\n", this)); \
HX_ASSERT(m_pRealResponse); HX_ADDREF(m_pRealResponse);
}
RTPStreamDoneResponseCallback::~RTPStreamDoneResponseCallback()
{
- RTPDPRINTF(B_CONS, ("%p: \
RTPStreamDoneResponseCallback::~RTPStreamDoneResponseCallback()\n", this)); + \
RTPDPRINTF(B_CONS, ("RTPStreamDoneResponseCallback destructor this=%p\n", this)); \
HX_RELEASE(m_pRealResponse); }
@@ -1412,11 +1185,9 @@
RTPStreamDoneResponseCallback::Func()
{
HX_RESULT res = HXR_OK;
-
- RTPDPRINTF(B_THREADV, ("RTPStreamDoneResponseCallback::Func() called! \
stream=%lu TID=%llu\n",
- m_unStreamNumber, MyOSThreadID()));
-
HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_MANAGER);
+ RTPDPRINTF(B_THREADV, ("RTPStreamDoneResponseCallback::Func() called! this=%p \
stream=%lu\n", + this, m_unStreamNumber));
if (g_TLS_RTPThreadType == RTP_THR_MANAGER)
{
@@ -1424,7 +1195,6 @@
}
- HX_RELEASE(m_pRealResponse);
return res;
}
@@ -1470,83 +1240,3 @@
}
-#if 0
-/************************************************************************
- * RTPPurgeReceiversCallback Methods
- *
- * Dispatches a PurgeReceivers call to a worker.
- */
-RTPPurgeReceiversCallback::RTPPurgeReceiversCallback()
- : m_lRefCount(0)
-{
- RTPDPRINTF(B_CONS, ("%p: \
RTPPurgeReceiversCallback::RTPPurgeReceiversCallback()\n", this));
-}
-
-RTPPurgeReceiversCallback::~RTPPurgeReceiversCallback()
-{
- RTPDPRINTF(B_CONS, ("%p: \
RTPPurgeReceiversCallback::~RTPPurgeReceiversCallback()\n", this));
-}
-
-/************************************************************************
- * IHXCallback Interface Methods ref: hxengin.h
- */
-STDMETHODIMP
-RTPPurgeReceiversCallback::Func()
-{
- HX_RESULT res = HXR_OK;
-
- HX_ASSERT(g_TLS_RTPThreadType == RTP_THR_WORKER);
-
- RTPDPRINTF(B_THREADV, ("RTPPurgeReceiversCallback::Func() called! TID=%llu\n",
- MyOSThreadID()));
-
- BroadcastReceiverThread* pWorkerThread = BroadcastReceiverThread::GetInstance();
- pWorkerThread->PurgeReceivers();
- HX_RELEASE(pWorkerThread);
-
- return res;
-}
-
-/************************************************************************
- * IUnknown COM Interface Methods ref: hxcom.h
- */
-STDMETHODIMP_(ULONG32)
-RTPPurgeReceiversCallback::AddRef()
-{
- return InterlockedIncrement(&m_lRefCount);
-}
-
-STDMETHODIMP_(ULONG32)
-RTPPurgeReceiversCallback::Release()
-{
- if (InterlockedDecrement(&m_lRefCount) > 0)
- {
- return m_lRefCount;
- }
-
- delete this;
- return 0;
-}
-
-STDMETHODIMP
-RTPPurgeReceiversCallback::QueryInterface(REFIID riid, void** ppvObj)
-{
- if (IsEqualIID(riid, IID_IHXCallback))
- {
- AddRef();
- *ppvObj = (IHXCallback*)this;
- return HXR_OK;
- }
- else if (IsEqualIID(riid, IID_IUnknown))
- {
- AddRef();
- *ppvObj = (IUnknown*)(IHXCallback*)this;
- return HXR_OK;
- }
-
- *ppvObj = NULL;
- return HXR_NOINTERFACE;
-}
-
-#endif
-
Index: rtpreceiver.cpp
===================================================================
RCS file: /cvsroot/server/broadcast/transport/rtp/recv/rtpreceiver.cpp,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- rtpreceiver.cpp 27 Oct 2011 23:24:49 -0000 1.5.2.3
+++ rtpreceiver.cpp 29 Oct 2011 20:51:09 -0000 1.5.2.4
@@ -136,7 +136,7 @@
RTPSocketHandler::ReceiverInit(IRTPReceiverManager* pManager,
UINT32 ulAddr, UINT16 nPort, const char* pszFileName)
{
- RTPDPRINTF(B_INFO, ("RTPSocketHandler::ReceiverInit called in thread %llu\n", \
(UINT64)MyOSThreadID())); + RTPDPRINTF(B_INFO, ("RTPSocketHandler::ReceiverInit \
called\n"));
HX_RESULT hresult;
@@ -207,7 +207,7 @@
if (HXR_OK == m_pContext->QueryInterface(IID_IHXErrorMessages, (void \
**)&pErrMsg)) {
char pTempString[256];
- SafeSprintf(pTempString, 255, "rtplive: Failed to bind to the port \
%d. Port may be in use", m_nLocalPort); + SafeSprintf(pTempString, \
255, "RTPLive: Failed to bind to the port %d. Port may be in use", \
m_nLocalPort);
pErrMsg->Report(HXLOG_ERR, HXR_FAIL, (ULONG32)HXR_FAIL, pTempString, \
NULL); }
@@ -215,7 +215,7 @@
}
else
{
- RTPDPRINTF(B_INFO, ("rtplive: Bound to port %d in thread %llu\n", \
m_nLocalPort, (UINT64)MyOSThreadID())); + RTPDPRINTF(B_INFO, ("RTPLive: \
Bound to port %d\n", m_nLocalPort)); }
}
return hresult;
@@ -225,8 +225,7 @@
RTPSocketHandler::Register(RTPStream* pResponse, UINT32 ulForeignAddr,
UINT32 ulReadSize)
{
- //printf("RTPSocketHandler::Register called in thread %llu\n",
- // (UINT64)MyOSThreadID()); fflush(0);
+ //RTPDPRINTF(B_INFO, ("RTPSocketHandler::Register called\n"));
HX_RESULT hresult = HXR_OK;
int* dummy;
@@ -265,8 +264,7 @@
HX_RESULT
RTPSocketHandler::Unregister(UINT32 ulForeignAddr)
{
- //printf("RTPSocketHandler::Unregister called in thread %llu\n",
- // (UINT64)MyOSThreadID()); fflush(0);
+ //RTPDPRINTF(B_INFO, ("RTPSocketHandler::Unregister called\n"));
RTPStream* pResponse;
@@ -304,7 +302,7 @@
void
RTPSocketHandler::Close()
{
- RTPDPRINTF(B_INFO, ("RTPSocketHandler::Close called in thread %llu\n", \
(UINT64)MyOSThreadID())); + RTPDPRINTF(B_INFO, ("RTPSocketHandler::Close \
called\n"));
if (m_bClosed)
{
@@ -359,8 +357,7 @@
// static int debugcount = 5000;
// if (InterlockedIncrement(&debugcount) >= 5000)
// {
-// printf("RTPSocketHandler::ReadDone is being called for port %d in thread \
%llu\n",
-// m_nLocalPort, (UINT64)MyOSThreadID()); fflush(0);
+// RTPDPRINTF(("RTPSocketHandler::ReadDone is being called for port %d\n", \
m_nLocalPort)); // debugcount = 0;
// }
//#endif
_______________________________________________
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