Changeset 839

Timestamp:

Mar 30, 2018, 10:19:28 AM (5 years ago)

Author:

roman

Message:

 

Location:

trunk/DirectShowSpy

Files:

• DirectShowSpy.vcxproj (modified) (6 diffs)
• FilterGraphSpy.h (modified) (6 diffs)
• Module.idl (modified) (2 diffs)
• Module.ini (modified) (1 diff)
• _Bin/DirectShowSpy-Win32.dll (modified) (previous)
• _Bin/DirectShowSpy-x64.dll (modified) (previous)

trunk/DirectShowSpy/DirectShowSpy.vcxproj

@@ -160 +160 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>Async</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -206 +205 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>Async</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -259 +257 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -313 +310 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -368 +364 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_TRACE=1;_TRACELEVEL=4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -422 +417 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_TRACE=1;_TRACELEVEL=4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>

trunk/DirectShowSpy/FilterGraphSpy.h

@@ -638 +638 @@
         CComPtr<IUnknown> m_pSite;
         CStringW m_sFriendlyName;
+
+        static VOID TraceProcessPerformance(LPCTSTR pszDescription = NULL, BOOL bForce = FALSE)
+        {
+                pszDescription;
+                #if _DEVELOPMENT || _TRACE
+                        const ULONG nTime = GetTickCount();
+                        MEMORYSTATUSEX MemoryStatus = { sizeof MemoryStatus };
+                        const BOOL bGlobalMemoryStatusExResult = GlobalMemoryStatusEx(&MemoryStatus);
+                        PROCESS_MEMORY_COUNTERS_EX Counters = { sizeof Counters };
+                        const BOOL bGetProcessMemoryInfoResult = GetProcessMemoryInfo(GetCurrentProcess(), (PROCESS_MEMORY_COUNTERS*) &Counters, sizeof Counters);
+                        _A(bGlobalMemoryStatusExResult && bGetProcessMemoryInfoResult);
+                        BOOL bReportGlobalMemoryStatusEx = FALSE, bReportGetProcessMemoryInfo = FALSE;
+                        #pragma region Reduce Similar Traces
+                        {
+                                _A(_pAtlModule);
+                                CComCritSecLock<CComCriticalSection> Lock(_pAtlModule->m_csStaticDataInitAndTypeInfo);
+                                static ULONG g_nReportTime = 0;
+                                static MEMORYSTATUSEX g_MemoryStatus;
+                                static PROCESS_MEMORY_COUNTERS_EX g_Counters;
+                                #if !defined(_DEBUG)
+                                        if(bForce || !g_nReportTime || nTime - g_nReportTime >= 15 * 1000) // 15 seconds
+                                        {
+                                                bReportGlobalMemoryStatusEx = bGlobalMemoryStatusExResult;
+                                                bReportGetProcessMemoryInfo = bGetProcessMemoryInfoResult;
+                                        } else
+                                        {
+                                                #pragma region MEMORYSTATUSEX
+                                                if(fabs(((DOUBLE) MemoryStatus.dwMemoryLoad - g_MemoryStatus.dwMemoryLoad) / ((MemoryStatus.dwMemoryLoad + g_MemoryStatus.dwMemoryLoad) / 2)) > 0.05) // 5%
+                                                        bReportGlobalMemoryStatusEx = TRUE;
+                                                else
+                                                if(fabs(((DOUBLE) MemoryStatus.ullAvailVirtual - g_MemoryStatus.ullAvailVirtual) / ((MemoryStatus.ullAvailVirtual + g_MemoryStatus.ullAvailVirtual) / 2)) > 0.05) // 5%
+                                                        bReportGlobalMemoryStatusEx = TRUE;
+                                                #pragma endregion 
+                                                #pragma region PROCESS_MEMORY_COUNTERS_EX
+                                                if(fabs(((DOUBLE) Counters.WorkingSetSize - g_Counters.WorkingSetSize) / ((Counters.WorkingSetSize + g_Counters.WorkingSetSize) / 2)) > 0.05) // 5%
+                                                        bReportGetProcessMemoryInfo = TRUE;
+                                                else 
+                                                if(fabs(((DOUBLE) Counters.PrivateUsage - g_Counters.PrivateUsage) / ((Counters.PrivateUsage + g_Counters.PrivateUsage) / 2)) > 0.05) // 5%
+                                                        bReportGetProcessMemoryInfo = TRUE;
+                                                #pragma endregion 
+                                        }
+                                #else
+                                        bReportGlobalMemoryStatusEx = bGlobalMemoryStatusExResult;
+                                        bReportGetProcessMemoryInfo = bGetProcessMemoryInfoResult;
+                                #endif // !defined(_DEBUG)
+                                if(bReportGlobalMemoryStatusEx)
+                                        g_MemoryStatus = MemoryStatus;
+                                if(bReportGetProcessMemoryInfo)
+                                        g_Counters = Counters;
+                                if(bReportGlobalMemoryStatusEx || bReportGetProcessMemoryInfo)
+                                        g_nReportTime = nTime;
+                        }
+                        #pragma endregion 
+                        CString sDescription = pszDescription;
+                        if(!sDescription.IsEmpty())
+                                sDescription.Append(_T(": "));
+                        if(bReportGlobalMemoryStatusEx)
+                        {
+                                _Z2(atlTraceGeneral, 2, _T("%s") _T("Memory Status, ") 
+                                        _T("dwMemoryLoad %d") _T(", ")
+                                        _T("ullTotalVirtual %s MB") _T(", ")
+                                        _T("ullAvailVirtual %s MB (in use %s MB)") //_T(", ")
+                                        _T("\n"), 
+                                        sDescription,
+                                        MemoryStatus.dwMemoryLoad,
+                                        _StringHelper::FormatNumber((LONGLONG) MemoryStatus.ullTotalVirtual >> 20),
+                                        _StringHelper::FormatNumber((LONGLONG) MemoryStatus.ullAvailVirtual >> 20), _StringHelper::FormatNumber((LONGLONG) (MemoryStatus.ullTotalVirtual - MemoryStatus.ullAvailVirtual) >> 20),
+                                        0);
+                        }
+                        if(bReportGetProcessMemoryInfo)
+                        {
+                                _Z2(atlTraceGeneral, 2, _T("%s") _T("Process Performance, ") 
+                                        _T("WorkingSetSize %s MB (peak %s MB)") _T(", ")
+                                        _T("PrivateUsage %s MB") //_T(", ")
+                                        _T("\n"), 
+                                        sDescription,
+                                        _StringHelper::FormatNumber((LONGLONG) Counters.WorkingSetSize >> 20), _StringHelper::FormatNumber((LONGLONG) Counters.PeakWorkingSetSize >> 20),
+                                        _StringHelper::FormatNumber((LONGLONG) Counters.PrivateUsage >> 20), 
+                                        0);
+                        }
+                #endif // _DEVELOPMENT || _TRACE
+        }
 
         BOOL IsAggregated() const
@@ -1167 +1249 @@
                 return S_OK;
         }
+        STDMETHOD(CreateFilterGraphHelper)(IFilterGraphHelper** ppFilterGraphHelper) override
+        {
+                _Z4(atlTraceCOM, 4, _T("this 0x%p\n"), this);
+                _ATLTRY
+                {
+                        __D(ppFilterGraphHelper, E_POINTER);
+                        *ppFilterGraphHelper = NULL;
+                        CObjectPtr<CFilterGraphHelper> pFilterGraphHelper;
+                        pFilterGraphHelper.Construct()->SetFilterGraph(this);
+                        *ppFilterGraphHelper = pFilterGraphHelper.Detach();
+                }
+                _ATLCATCHALL()
+                {
+                        _Z_EXCEPTION();
+                }
+                return S_OK;
+        }
 
 // ISpyEx
@@ -1402 +1501 @@
                         OnRun(pT, &bDefault);
                 HOOK_EPILOG()
+                TraceProcessPerformance(_T("Before IMediaControl::Run"));
                 const HRESULT nRunResult = m_pInnerMediaControl->Run();
                 _Z4_DSHRESULT(nRunResult);
+                TraceProcessPerformance(_T("After IMediaControl::Run"));
                 return nRunResult;
         }
@@ -1422 +1523 @@
                         OnPause(pT, &bDefault);
                 HOOK_EPILOG()
-                return m_pInnerMediaControl->Pause();
+                TraceProcessPerformance(_T("Before IMediaControl::Pause"));
+                const HRESULT nPauseResult = m_pInnerMediaControl->Pause();
+                _Z4_DSHRESULT(nPauseResult);
+                TraceProcessPerformance(_T("After IMediaControl::Pause"));
+                return nPauseResult;
         }
         STDMETHOD(Stop)() override
@@ -1430 +1535 @@
                         OnStop(pT, &bDefault);
                 HOOK_EPILOG()
-                return m_pInnerMediaControl->Stop();
+                TraceProcessPerformance(_T("Before IMediaControl::Stop"));
+                const HRESULT nStopResult = m_pInnerMediaControl->Stop();
+                _Z4_DSHRESULT(nStopResult);
+                TraceProcessPerformance(_T("After IMediaControl::Stop"));
+                return nStopResult;
         }
         STDMETHOD(GetState)(LONG nTimeout, OAFilterState* pState) override
@@ -1516 +1625 @@
                         if(nEventCode == EC_ERRORABORTEX && nParameter2)
                                 _Z4(atlTraceGeneral, 4, _T("nParameter2 \"%s\"\n"), CString((BSTR) nParameter2));
+                        TraceProcessPerformance(_FilterGraphHelper::FormatEventCode(nEventCode), TRUE);
                         static CConstIntegerRegistryValue g_nErrorAbortMiniDumpMode(_T("ErrorAbort MiniDump Mode")); // 0 Default (=1), 1 Disabled, 2 Enabled
                         if((DWORD) g_nErrorAbortMiniDumpMode == 2) // Enabled

trunk/DirectShowSpy/Module.idl

@@ -64 +64 @@
                 HRESULT RegisterComment([in] IUnknown* pBaseFilterUnknown, [in] const WCHAR* pszStreamName, [in] const WCHAR* pszComment, [in] USHORT nHighlight);
         };
+        interface IFilterGraphHelper;
         [
                 object,
@@ -85 +86 @@
                 [id(8)] HRESULT ReadRunPropertyBag([in] IUnknown* pBaseFilterUnknown, [in] VARIANT_BOOL bAllowExtension, [out, retval] VARIANT* pvValue);
                 [id(9)] HRESULT CreateMediaSampleTrace([out, retval] IMediaSampleTrace** ppMediaSampleTrace);
+                [id(10)] HRESULT CreateFilterGraphHelper([out, retval] IFilterGraphHelper** ppFilterGraphHelper);
         };
         [

trunk/DirectShowSpy/Module.ini

@@ -4 +4 @@
 ;Language=133 ;MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US)
 ;Version String Format=%d.%d.%d.%d
-Current Build Number=2134
+Current Build Number=2138