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

List:       helix-video-cvs
Subject:    [Video-cvs] sitelib/pub baseroot.h,1.5,1.6 basesite.h,1.11,1.12
From:       ping () helixcommunity ! org
Date:       2006-02-16 23:08:41
[Download RAW message or body]

Update of /cvsroot/video/sitelib/pub
In directory cvs:/tmp/cvs-serv27903/sitelib/pub

Modified Files:
	baseroot.h basesite.h 
Log Message:
We have IHXMutex, it's implemented by CHXMutex. CCF uses CHXMutex to create new \
instance of mutex. There are many places throughout the code where mutex are directly \
created from HXMutex::MakeMutex() instead of created from CCF.

The cleanup involves:
1. Moved hxmutex.cpp and hxmutex.h from client/common/system to common/system, \
hxmutex.cpp implements CHXMutex and internally calls HXMutex::MakeMutex() to create \
platform specific mutex. 2. Implemented CreateInstanceCCF(REFCLSID clsid, void** \
pObject, IUnknown* pContext); in pckunpck.cpp as generic method to create object from \
CCF. 3. Modified other CreateXXXCCF method to internally call CreateInstanceCCF.
4. Modified HXSemaphore and HXScopeLock to take IHXMutex* instead of HXMutex*.
5. Moved creation of mutex from constructor to where the context is ready.
6. Modified certain method to pass context to the object that need mutex.
7. Replaced the following blob:

   #if defined(THREADS_SUPPORTED)
       HXMutex::MakeMutex(m_pMutex);
   #else
       HXMutex::MakeStubMutex(m_pMutex);    
   #endif // defined(THREADS_SUPPORTED) 

   with

   CreateInstanceCCF(CLSID_IHXMutex, (void**)&m_pMutex, m_pContext);

   The previous logic is now centralized in CHXMutex.

8. Replaced "HX_DELETE(m_pMutext)" with "HX_RELEASE(m_pMutex)".

CR by Eric


Index: basesite.h
===================================================================
RCS file: /cvsroot/video/sitelib/pub/basesite.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- basesite.h	11 Mar 2005 19:58:08 -0000	1.11
+++ basesite.h	16 Feb 2006 23:08:38 -0000	1.12
@@ -177,7 +177,7 @@
     IHXSiteWatcher*       m_pWatcher;
     IUnknown*              m_pContext;
     HXxSize                m_size;
-    HXMutex*              m_pMutex;
+    IHXMutex*              m_pMutex;
     HXxPoint               m_position;
     HXxPoint               m_positionOrig;
     HXxPoint               m_CreateWindowPos;

Index: baseroot.h
===================================================================
RCS file: /cvsroot/video/sitelib/pub/baseroot.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- baseroot.h	17 Nov 2005 00:02:11 -0000	1.5
+++ baseroot.h	16 Feb 2006 23:08:38 -0000	1.6
@@ -148,8 +148,8 @@
     ColorFuncAccess* GetColorAccess() {return zm_pColorAcc;}
    
 protected:
-    HXMutex*    m_pMutex;
-    HXMutex*    m_pCompMutex;
+    IHXMutex*    m_pMutex;
+    IHXMutex*    m_pCompMutex;
     CHXSimpleList m_pBltRects;
     LONG32       m_lRefCount;
     IUnknown*    m_pContext;


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