Remove BINDER_DEBUG_LOG (dotnet#27574)

Author: elinor-fung

Documentation/project-docs/clr-configuration-knobs.md

@@ -595,7 +595,6 @@ Name | Description | Type | Class | Default Value | Flags
 Name | Description | Type | Class | Default Value | Flags
 -----|-------------|------|-------|---------------|-------
 `APIThreadStress` | Used to test Loader for race conditions | `DWORD` | `INTERNAL` | |
-`CoreClrBinderLog` | Debug flag that enabled detailed log for new binder (similar to stress logging). | `STRING` | `INTERNAL` | |
 `ForceLog` | Fusion flag to enforce assembly binding log. Heavily used and documented in MSDN and BLOGS. | `DWORD` | `EXTERNAL` | |
 `WinMDPath` | Path for Windows WinMD files | `STRING` | `INTERNAL` | |
 

src/binder/CMakeLists.txt

@@ -4,24 +4,23 @@ include_directories(BEFORE "../vm")
 include_directories(BEFORE "inc")
 
 set(BINDER_COMMON_SOURCES
-    variables.cpp
-    utils.cpp
-    assemblyname.cpp
-    propertymap.cpp
     applicationcontext.cpp
     assembly.cpp
-    failurecache.cpp
     assemblybinder.cpp
-    stringlexer.cpp
-    clrprivbindercoreclr.cpp
-    debuglog.cpp
+    assemblyidentitycache.cpp
+    assemblyname.cpp
     bindinglog.cpp
+    bindertracing.cpp
     cdebuglog.cpp
-    textualidentityparser.cpp
-    assemblyidentitycache.cpp
+    clrprivbindercoreclr.cpp
     coreclrbindercommon.cpp
+    failurecache.cpp
     fusionassemblyname.cpp
-    bindertracing.cpp
+    propertymap.cpp
+    stringlexer.cpp
+    textualidentityparser.cpp
+    utils.cpp
+    variables.cpp
 )
 
 set(BINDER_COMMON_HEADERS
@@ -47,7 +46,6 @@ set(BINDER_COMMON_HEADERS
     inc/cdebuglog.hpp
     inc/clrprivbindercoreclr.h
     inc/coreclrbindercommon.h
-    inc/debuglog.hpp
     inc/failurecache.hpp
     inc/failurecachehashtraits.hpp
     inc/fusionassemblyname.hpp

src/binder/applicationcontext.cpp

@@ -12,19 +12,12 @@
 //
 // ============================================================
 
-#ifndef FEATURE_CORESYSTEM
-#define DISABLE_BINDER_DEBUG_LOGGING
-#endif
-
 #include "applicationcontext.hpp"
 #include "stringarraylist.h"
 #include "loadcontext.hpp"
 #include "propertymap.hpp"
 #include "failurecache.hpp"
 #include "assemblyidentitycache.hpp"
-#ifdef FEATURE_VERSIONING_LOG
-#include "debuglog.hpp"
-#endif // FEATURE_VERSIONING_LOG
 #include "utils.hpp"
 #include "variables.hpp"
 #include "ex.h"
@@ -111,8 +104,6 @@ namespace BINDER_SPACE
     HRESULT ApplicationContext::Init()
     {
         HRESULT hr = S_OK;
-        BINDER_LOG_ENTER(W("ApplicationContext::Init"));
-        BINDER_LOG_POINTER(W("this"), this);
 
         ReleaseHolder<ExecutionContext> pExecutionContext;
 
@@ -141,7 +132,6 @@ namespace BINDER_SPACE
         }
 
     Exit:
-        BINDER_LOG_LEAVE_HR(W("ApplicationContext::Init"), hr);
         return hr;
     }
 
@@ -220,21 +210,15 @@ namespace BINDER_SPACE
                                                   BOOL     fAcquireLock)
     {
         HRESULT hr = S_OK;
-        BINDER_LOG_ENTER(W("ApplicationContext::SetupBindingPaths"));
-        BINDER_LOG_POINTER(W("this"), this);
 
 #ifndef CROSSGEN_COMPILE
         CRITSEC_Holder contextLock(fAcquireLock ? GetCriticalSectionCookie() : NULL);
 #endif
         if (m_pTrustedPlatformAssemblyMap != nullptr)
         {
-#if defined(BINDER_DEBUG_LOG)
-            BINDER_LOG(W("ApplicationContext::SetupBindingPaths: Binding paths already setup"));
-#endif // BINDER_LOG_STRING
             GO_WITH_HRESULT(S_OK);
         }
 
-
         //
         // Parse TrustedPlatformAssemblies
         //
@@ -256,7 +240,6 @@ namespace BINDER_SPACE
 #ifndef CROSSGEN_COMPILE
             if (Path::IsRelative(fileName))
             {
-                BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Relative path not allowed"), fileName);
                 GO_WITH_HRESULT(E_INVALIDARG);
             }
 #endif
@@ -329,7 +312,6 @@ namespace BINDER_SPACE
                 if ((pExistingEntry->m_wszILFileName != nullptr && !isNativeImage) ||
                     (pExistingEntry->m_wszNIFileName != nullptr && isNativeImage))
                 {
-                    BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Skipping TPA entry because of already existing IL/NI entry for short name "), fileName.GetUnicode());
                     continue;
                 }
             }
@@ -374,8 +356,6 @@ namespace BINDER_SPACE
             FileNameMapEntry fileNameExistenceEntry;
             fileNameExistenceEntry.m_wszFileName = wszFileName;
             m_pFileNameHash->AddOrReplace(fileNameExistenceEntry);
-            
-            BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Added TPA entry"), wszFileName);
         }
 
         //
@@ -396,13 +376,11 @@ namespace BINDER_SPACE
 #ifndef CROSSGEN_COMPILE
             if (Path::IsRelative(pathName))
             {
-                BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Relative path not allowed"), pathName);
                 GO_WITH_HRESULT(E_INVALIDARG);
             }
 #endif
 
             m_platformResourceRoots.Append(pathName);
-            BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Added resource root"), pathName);
         }
 
         //
@@ -423,13 +401,11 @@ namespace BINDER_SPACE
 #ifndef CROSSGEN_COMPILE
             if (Path::IsRelative(pathName))
             {
-                BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Relative path not allowed"), pathName);
                 GO_WITH_HRESULT(E_INVALIDARG);
             }
 #endif
 
             m_appPaths.Append(pathName);
-            BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Added App Path"), pathName);
         }
 
         //
@@ -450,26 +426,21 @@ namespace BINDER_SPACE
 #ifndef CROSSGEN_COMPILE
             if (Path::IsRelative(pathName))
             {
-                BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Relative path not allowed"), pathName);
                 GO_WITH_HRESULT(E_INVALIDARG);
             }
 #endif
 
             m_appNiPaths.Append(pathName);
-            BINDER_LOG_STRING(W("ApplicationContext::SetupBindingPaths: Added App NI Path"), pathName);
         }
 
     Exit:
-        BINDER_LOG_LEAVE_HR(W("ApplicationContext::SetupBindingPaths"), hr);
         return hr;
     }
 
     HRESULT ApplicationContext::GetAssemblyIdentity(LPCSTR                 szTextualIdentity,
                                                     AssemblyIdentityUTF8 **ppAssemblyIdentity)
     {
         HRESULT hr = S_OK;
-        BINDER_LOG_ENTER(W("ApplicationContext::GetAssemblyIdentity"));
-        BINDER_LOG_POINTER(W("this"), this);
 
         _ASSERTE(szTextualIdentity != NULL);
         _ASSERTE(ppAssemblyIdentity != NULL);
@@ -496,7 +467,6 @@ namespace BINDER_SPACE
         *ppAssemblyIdentity = pAssemblyIdentity;
 
     Exit:
-        BINDER_LOG_LEAVE_HR(W("ApplicationContext::GetAssemblyIdentity"), hr);
         return hr;
     }
 

src/binder/assembly.cpp

@@ -81,8 +81,6 @@ namespace BINDER_SPACE
 
     Assembly::~Assembly()
     {
-        BINDER_LOG_ASSEMBLY_NAME(L"destructing assembly", m_pAssemblyName);
-
         if (m_pPEImage != NULL)
         {
             BinderReleasePEImage(m_pPEImage);
@@ -109,7 +107,6 @@ namespace BINDER_SPACE
                            BOOL                     fIsInGAC)
     {
         HRESULT hr = S_OK;
-        BINDER_LOG_ENTER(L"Assembly::Init");
 
         ReleaseHolder<AssemblyName> pAssemblyName;
         SAFE_NEW(pAssemblyName, AssemblyName);
@@ -122,10 +119,6 @@ namespace BINDER_SPACE
             GetPath().Set(assemblyPath);
         }
 
-        BINDER_LOG_ASSEMBLY_NAME(L"AssemblyNameDef", pAssemblyName);
-        BINDER_LOG_STRING(L"System Architecture",
-                          AssemblyName::ArchitectureToString(GetSystemArchitecture()));
-
         // Safe architecture for validation
         PEKIND kAssemblyArchitecture;
         kAssemblyArchitecture = pAssemblyName->GetArchitecture();
@@ -145,7 +138,6 @@ namespace BINDER_SPACE
         }
 
     Exit:
-        BINDER_LOG_LEAVE_HR(L"Assembly::Init", hr);
         return hr;
     }