From 795629859e4a08c4e9128dac5e4d48f6457af8dc Mon Sep 17 00:00:00 2001
From: Aditya Mandaleeka <adityam@microsoft.com>
Date: Thu, 15 Oct 2015 17:19:52 -0700
Subject: [PATCH] Remove CPalSynchronizationManager::Shutdown

Commit migrated from https://github.com/dotnet/coreclr/commit/b409ad2b921c6e2fa4bd429f7a9560ef960ad701
---
 src/coreclr/src/pal/src/init/pal.cpp              |  1 -
 src/coreclr/src/pal/src/synchmgr/synchmanager.cpp | 65 +----------------------
 src/coreclr/src/pal/src/synchmgr/synchmanager.hpp |  1 -
 3 files changed, 1 insertion(+), 66 deletions(-)

diff --git a/src/coreclr/src/pal/src/init/pal.cpp b/src/coreclr/src/pal/src/init/pal.cpp
index 7745b93..fbd246e 100644
--- a/src/coreclr/src/pal/src/init/pal.cpp
+++ b/src/coreclr/src/pal/src/init/pal.cpp
@@ -756,7 +756,6 @@ Parameters :
 void 
 PALCommonCleanup(BOOL full_cleanup)
 {
-    CPalThread *pThread = InternalGetCurrentThread();
     static bool done = false;
 
     if (!done)
diff --git a/src/coreclr/src/pal/src/synchmgr/synchmanager.cpp b/src/coreclr/src/pal/src/synchmgr/synchmanager.cpp
index e8a35d0..4fdcddc 100644
--- a/src/coreclr/src/pal/src/synchmgr/synchmanager.cpp
+++ b/src/coreclr/src/pal/src/synchmgr/synchmanager.cpp
@@ -120,23 +120,10 @@ namespace CorUnix
     needs to be carried out when core PAL subsystems are still active
     --*/
     PAL_ERROR CPalSynchMgrController::PrepareForShutdown()
-    {        
+    {
         return CPalSynchronizationManager::PrepareForShutdown();
     }
 
-    /*++
-    Method:
-      CPalSynchMgrController::Shutdown
-
-    Synchronization Manager's final shutdown step
-    --*/
-    PAL_ERROR CPalSynchMgrController::Shutdown(
-        CPalThread *pthrCurrent,
-        bool fFullCleanup)
-    {        
-        return CPalSynchronizationManager::Shutdown(pthrCurrent, fFullCleanup);
-    }
-
     //////////////////////////////////
     //                              //
     //  CPalSynchronizationManager  //
@@ -1828,56 +1815,6 @@ namespace CorUnix
 
     /*++
     Method:
-      CPalSynchronizationManager::Shutdown
-
-    Synchronization Manager's final shutdown step.
-    Private method, it is called only by CPalSynchMgrController.
-    --*/
-    PAL_ERROR CPalSynchronizationManager::Shutdown(
-        CPalThread *pthrCurrent,
-        bool fFullCleanup)
-    {
-        PAL_ERROR palErr = NO_ERROR;
-        CPalSynchronizationManager * pSynchManager = GetInstance();
-
-        if ((LONG)SynchMgrStatusReadyForProcessShutDown != s_lInitStatus)
-        {
-            _ASSERT_MSG((LONG)SynchMgrStatusRunning != s_lInitStatus,
-                        "Synchronization Manager: Shutdown called with no "
-                        "prior PrepareForShutdown call");
-
-            ERROR("Unexpected initialization status found "
-                  "in Shutdown [expected=%d current=%d]\n", 
-                  (int)SynchMgrStatusShuttingDown, s_lInitStatus.Load());
-            palErr = ERROR_INTERNAL_ERROR;
-            goto S_exit;
-        }
-
-        pSynchManager->m_cacheSHRSynchData.Flush(pthrCurrent);
-        pSynchManager->m_cacheSHRWTListNodes.Flush(pthrCurrent);
-
-        if (fFullCleanup)
-        {
-            pSynchManager->m_cacheWaitCtrlrs.Flush(pthrCurrent);
-            pSynchManager->m_cacheStateCtrlrs.Flush(pthrCurrent);
-            pSynchManager->m_cacheSynchData.Flush(pthrCurrent);
-            pSynchManager->m_cacheWTListNodes.Flush(pthrCurrent);
-            pSynchManager->m_cacheThreadApcInfoNodes.Flush(pthrCurrent);
-            pSynchManager->m_cacheOwnedObjectsListNodes.Flush(pthrCurrent);
-
-            InternalDeleteCriticalSection(&s_csSynchProcessLock);
-            InternalDeleteCriticalSection(&s_csMonitoredProcessesLock);
-        }
-
-        s_lInitStatus = (LONG)SynchMgrStatusIdle;
-        s_pObjSynchMgr = NULL;
-
-    S_exit:
-        return palErr;
-    }
-
-    /*++
-    Method:
       CPalSynchronizationManager::WorkerThread
 
     Synchronization Manager's Worker Thread
diff --git a/src/coreclr/src/pal/src/synchmgr/synchmanager.hpp b/src/coreclr/src/pal/src/synchmgr/synchmanager.hpp
index 8fd6d38..132ca06 100644
--- a/src/coreclr/src/pal/src/synchmgr/synchmanager.hpp
+++ b/src/coreclr/src/pal/src/synchmgr/synchmanager.hpp
@@ -605,7 +605,6 @@ namespace CorUnix
             CPalThread * pthrCurrent);
         static PAL_ERROR StartWorker(CPalThread * pthrCurrent);
         static PAL_ERROR PrepareForShutdown(void);
-        static PAL_ERROR Shutdown(CPalThread *pthrCurrent, bool fFullCleanup);
 
     public:
         virtual ~CPalSynchronizationManager();
-- 
2.7.4