[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] broadcast/transport/rtp/recv/pub rtpbcobj.h, 1.1.2.3,
From: dcollins () helixcommunity ! org
Date: 2011-10-27 23:24:54
[Download RAW message or body]
Update of /cvsroot/server/broadcast/transport/rtp/recv/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv31135/pub
Modified Files:
Tag: DEAN_PERF_2011_10_17
rtpbcobj.h rtpbcplin.h rtpworkercb.h sdpfileowner.h
Log Message:
experimental DEAN_PERF_2011_10_17 branch checkin: adding more callbacks, \
debugging/tracemask, misc cleanup
Index: rtpbcobj.h
===================================================================
RCS file: /cvsroot/server/broadcast/transport/rtp/recv/pub/Attic/rtpbcobj.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- rtpbcobj.h 26 Oct 2011 21:40:10 -0000 1.1.2.3
+++ rtpbcobj.h 27 Oct 2011 23:24:51 -0000 1.1.2.4
@@ -49,6 +49,9 @@
*/
#define DEFAULT_MIN_PREROLL 1000 /* 1 second */
+// FIXME
+#define RDPRINTF(a,b) /**/
+
/****************************************************************************
* Forward declarations
*/
@@ -170,10 +173,12 @@
/****** Private Class Variables ****************************************/
INT32 m_lRefCount;
IUnknown* m_pContext;
- IHXValues* m_pOptions;
- IHXFormatResponse* m_pFFResponse;
IHXThreadSafeScheduler* m_pScheduler;
IHXFileSystemManager* m_pFSManager;
+ IHXRegistry* m_pRegistry;
+ IHXValues* m_pOptions;
+ IHXFormatResponse* m_pFFResponse;
+ RTPWorkerResponseWrapper* m_pFFResponseWrapper;
RTPBCStreamsObject* m_pStreamsObject;
@@ -188,6 +193,7 @@
~RTPBroadcastObject();
HX_RESULT DispatchURL(const char* pPath);
+ void GetTraceMask(void);
};
Index: rtpbcplin.h
===================================================================
RCS file: /cvsroot/server/broadcast/transport/rtp/recv/pub/Attic/rtpbcplin.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- rtpbcplin.h 26 Oct 2011 20:36:38 -0000 1.1.2.2
+++ rtpbcplin.h 27 Oct 2011 23:24:51 -0000 1.1.2.3
@@ -59,8 +59,17 @@
class CHXList;
_INTERFACE IHXWorkerThreadManager;
-#define RTP_DEFAULT_THREADS 1
-#define RTP_MAX_THREADS 64
+#if defined(_WIN32)
+#define __TLS __declspec(thread)
+#else
+#define __TLS __thread
+#endif
+extern __TLS RTPThreadType g_TLS_threadType;
+extern __TLS UINT32 g_TLS_RTPThreadID;
+extern __TLS IUnknown* g_TLS_pContext;
+extern __TLS IHXCommonClassFactory* g_TLS_pClassFactory;
+extern __TLS IHXWorkerThreadManager* g_TLS_pWTManager;
+extern __TLS UINT32 g_TLS_RTPProcNum;
#ifdef _UNIX
#include <pthread.h>
Index: rtpworkercb.h
===================================================================
RCS file: /cvsroot/server/broadcast/transport/rtp/recv/pub/Attic/rtpworkercb.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- rtpworkercb.h 26 Oct 2011 20:36:39 -0000 1.1.2.1
+++ rtpworkercb.h 27 Oct 2011 23:24:51 -0000 1.1.2.2
@@ -62,6 +62,59 @@
/****************************************************************************
+ * RTPWorkerResponseWrapper Class
+ */
+class RTPWorkerResponseWrapper : public IHXFormatResponse
+{
+public:
+ /****** Public Class Methods ******************************************/
+ RTPWorkerResponseWrapper(IHXFormatResponse* pRealResponse,
+ UINT32 ulManagerThreadID);
+
+ /************************************************************************
+ * IUnknown COM Interface Methods ref: hxcom.h
+ */
+ STDMETHOD(QueryInterface) (THIS_
+ REFIID riid,
+ void** ppvObj);
+
+ STDMETHOD_(ULONG32,AddRef) (THIS);
+
+ STDMETHOD_(ULONG32,Release) (THIS);
+
+ /************************************************************************
+ * IHXFormatResponse Interface Methods ref: hxformt.h
+ */
+ STDMETHOD(InitDone) (THIS_
+ HX_RESULT status);
+
+ STDMETHOD(PacketReady) (THIS_
+ HX_RESULT status,
+ IHXPacket* pPacket);
+
+ STDMETHOD(SeekDone) (THIS_
+ HX_RESULT status);
+
+ STDMETHOD(FileHeaderReady) (THIS_
+ HX_RESULT status,
+ IHXValues* pHeader);
+
+ STDMETHOD(StreamHeaderReady) (THIS_
+ HX_RESULT status,
+ IHXValues* pHeader);
+
+ STDMETHOD(StreamDone) (THIS_
+ UINT16 unStreamNumber);
+
+private:
+ virtual ~RTPWorkerResponseWrapper();
+
+ INT32 m_lRefCount;
+ UINT32 m_ulManagerThreadID;
+ IHXFormatResponse* m_pRealResponse;
+};
+
+/****************************************************************************
* SDPFileAddedCallback
*/
class SDPFileAddedCallback : public IHXCallback
@@ -146,4 +199,64 @@
HXBOOL m_bFlushPackets;
};
+/****************************************************************************
+ * RTPInitBroadcastCallback
+ */
+class RTPInitBroadcastCallback : public IHXCallback
+{
+public:
+ RTPInitBroadcastCallback(const char* pFileName,
+ RTPBCStreamsObject* pStreamsObject,
+ RTPWorkerResponseWrapper* pWrapper);
+
+ /************************************************************************
+ * IUnknown COM Interface Methods ref: hxcom.h
+ */
+ STDMETHOD (QueryInterface ) (THIS_ REFIID ID, void** ppInterfaceObj);
+ STDMETHOD_(UINT32, AddRef ) (THIS);
+ STDMETHOD_(UINT32, Release) (THIS);
+
+ /************************************************************************
+ * IHXCallback Interface Methods ref: hxengin.h
+ */
+ STDMETHOD(Func) (THIS);
+
+private:
+ virtual ~RTPInitBroadcastCallback();
+
+ INT32 m_lRefCount;
+ const char* m_pFileName;
+ RTPWorkerResponseWrapper* m_pResponseWrapper;
+ RTPBCStreamsObject* m_pStreamsObject;
+};
+
+/****************************************************************************
+ * RTPInitBroadcastResponseCallback
+ */
+class RTPInitBroadcastResponseCallback : public IHXCallback
+{
+public:
+ RTPInitBroadcastResponseCallback(IHXFormatResponse* pRealResponse,
+ HX_RESULT status);
+
+ /************************************************************************
+ * IUnknown COM Interface Methods ref: hxcom.h
+ */
+ STDMETHOD (QueryInterface ) (THIS_ REFIID ID, void** ppInterfaceObj);
+ STDMETHOD_(UINT32, AddRef ) (THIS);
+ STDMETHOD_(UINT32, Release) (THIS);
+
+ /************************************************************************
+ * IHXCallback Interface Methods ref: hxengin.h
+ */
+ STDMETHOD(Func) (THIS);
+
+private:
+ virtual ~RTPInitBroadcastResponseCallback();
+
+ INT32 m_lRefCount;
+ HX_RESULT m_lStatus;
+ IHXFormatResponse* m_pRealResponse;
+};
+
#endif /*_RTPWORKERCB_H_*/
Index: sdpfileowner.h
===================================================================
RCS file: /cvsroot/server/broadcast/transport/rtp/recv/pub/Attic/sdpfileowner.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- sdpfileowner.h 26 Oct 2011 20:36:40 -0000 1.1.2.1
+++ sdpfileowner.h 27 Oct 2011 23:24:51 -0000 1.1.2.2
@@ -58,7 +58,7 @@
class SDPFileOwner
{
public:
- SDPFileOwner(IUnknown* pContext);
+ SDPFileOwner();
~SDPFileOwner();
HX_RESULT FindOwnerThread (const char* pcFileName, UINT32* pThreadID);
_______________________________________________
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