Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit b409ad2

Browse files
Remove CPalSynchronizationManager::Shutdown
1 parent 99b1146 commit b409ad2

File tree

3 files changed

+1
-66
lines changed

3 files changed

+1
-66
lines changed

src/pal/src/init/pal.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,6 @@ Parameters :
756756
void
757757
PALCommonCleanup(BOOL full_cleanup)
758758
{
759-
CPalThread *pThread = InternalGetCurrentThread();
760759
static bool done = false;
761760

762761
if (!done)

src/pal/src/synchmgr/synchmanager.cpp

Lines changed: 1 addition & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -120,23 +120,10 @@ namespace CorUnix
120120
needs to be carried out when core PAL subsystems are still active
121121
--*/
122122
PAL_ERROR CPalSynchMgrController::PrepareForShutdown()
123-
{
123+
{
124124
return CPalSynchronizationManager::PrepareForShutdown();
125125
}
126126

127-
/*++
128-
Method:
129-
CPalSynchMgrController::Shutdown
130-
131-
Synchronization Manager's final shutdown step
132-
--*/
133-
PAL_ERROR CPalSynchMgrController::Shutdown(
134-
CPalThread *pthrCurrent,
135-
bool fFullCleanup)
136-
{
137-
return CPalSynchronizationManager::Shutdown(pthrCurrent, fFullCleanup);
138-
}
139-
140127
//////////////////////////////////
141128
// //
142129
// CPalSynchronizationManager //
@@ -1826,56 +1813,6 @@ namespace CorUnix
18261813
return palErr;
18271814
}
18281815

1829-
/*++
1830-
Method:
1831-
CPalSynchronizationManager::Shutdown
1832-
1833-
Synchronization Manager's final shutdown step.
1834-
Private method, it is called only by CPalSynchMgrController.
1835-
--*/
1836-
PAL_ERROR CPalSynchronizationManager::Shutdown(
1837-
CPalThread *pthrCurrent,
1838-
bool fFullCleanup)
1839-
{
1840-
PAL_ERROR palErr = NO_ERROR;
1841-
CPalSynchronizationManager * pSynchManager = GetInstance();
1842-
1843-
if ((LONG)SynchMgrStatusReadyForProcessShutDown != s_lInitStatus)
1844-
{
1845-
_ASSERT_MSG((LONG)SynchMgrStatusRunning != s_lInitStatus,
1846-
"Synchronization Manager: Shutdown called with no "
1847-
"prior PrepareForShutdown call");
1848-
1849-
ERROR("Unexpected initialization status found "
1850-
"in Shutdown [expected=%d current=%d]\n",
1851-
(int)SynchMgrStatusShuttingDown, s_lInitStatus.Load());
1852-
palErr = ERROR_INTERNAL_ERROR;
1853-
goto S_exit;
1854-
}
1855-
1856-
pSynchManager->m_cacheSHRSynchData.Flush(pthrCurrent);
1857-
pSynchManager->m_cacheSHRWTListNodes.Flush(pthrCurrent);
1858-
1859-
if (fFullCleanup)
1860-
{
1861-
pSynchManager->m_cacheWaitCtrlrs.Flush(pthrCurrent);
1862-
pSynchManager->m_cacheStateCtrlrs.Flush(pthrCurrent);
1863-
pSynchManager->m_cacheSynchData.Flush(pthrCurrent);
1864-
pSynchManager->m_cacheWTListNodes.Flush(pthrCurrent);
1865-
pSynchManager->m_cacheThreadApcInfoNodes.Flush(pthrCurrent);
1866-
pSynchManager->m_cacheOwnedObjectsListNodes.Flush(pthrCurrent);
1867-
1868-
InternalDeleteCriticalSection(&s_csSynchProcessLock);
1869-
InternalDeleteCriticalSection(&s_csMonitoredProcessesLock);
1870-
}
1871-
1872-
s_lInitStatus = (LONG)SynchMgrStatusIdle;
1873-
s_pObjSynchMgr = NULL;
1874-
1875-
S_exit:
1876-
return palErr;
1877-
}
1878-
18791816
/*++
18801817
Method:
18811818
CPalSynchronizationManager::WorkerThread

src/pal/src/synchmgr/synchmanager.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@ namespace CorUnix
605605
CPalThread * pthrCurrent);
606606
static PAL_ERROR StartWorker(CPalThread * pthrCurrent);
607607
static PAL_ERROR PrepareForShutdown(void);
608-
static PAL_ERROR Shutdown(CPalThread *pthrCurrent, bool fFullCleanup);
609608

610609
public:
611610
virtual ~CPalSynchronizationManager();

0 commit comments

Comments
 (0)