Remove unused step logic from PALCommonCleanup.

Author: adityamandaleeka

src/pal/src/include/pal/init.h

@@ -38,28 +38,18 @@ Utility function to force PAL to shutdown state
 --*/
 void PALShutdown( void );
 
-typedef enum
-{
-    PALCLEANUP_STEP_ONE, /* enum MUST start from 0 */
-    PALCLEANUP_STEP_TWO,
-    PALCLEANUP_ALL_STEPS,
-    PALCLEANUP_STEP_INVALID          /* This const MUST be the last entry
-                                        in the enum */
-} PALCLEANUP_STEP;
-
 /*++
 Function:
   PALCommonCleanup
 
 Utility function to free any resource used by the PAL. 
 
 Parameters :
-    step:          selects the desired cleanup step
     full_cleanup:  TRUE: cleanup only what's needed and leave the rest 
                          to the OS process cleanup
                    FALSE: full cleanup 
 --*/
-void PALCommonCleanup( PALCLEANUP_STEP step, BOOL full_cleanup );
+void PALCommonCleanup( BOOL full_cleanup );
 
 extern Volatile<INT> init_count;
 

src/pal/src/init/pal.cpp

@@ -754,128 +754,35 @@ Parameters :
                    TRUE:  full cleanup 
 --*/
 void 
-PALCommonCleanup(PALCLEANUP_STEP step, BOOL full_cleanup)
+PALCommonCleanup(BOOL full_cleanup)
 {
     CPalThread *pThread = InternalGetCurrentThread();
-    static int step_done[PALCLEANUP_STEP_INVALID] = { 0 };
+    static bool done = false;
 
-    switch (step)
+    if (!done)
     {
-    case PALCLEANUP_ALL_STEPS:
-    case PALCLEANUP_STEP_ONE:
-        /* Note: in order to work correctly, this step should be executed with 
-           init_count > 0
-         */
-        if (!step_done[PALCLEANUP_STEP_ONE])
-        {
-            step_done[PALCLEANUP_STEP_ONE] = 1;
+        done = true;
 
-            PALSetShutdownIntent();
+        PALSetShutdownIntent();
 
-            //
-            // Let the synchronization manager know we're about to shutdown
-            //
+        //
+        // Let the synchronization manager know we're about to shutdown
+        //
 
-            CPalSynchMgrController::PrepareForShutdown();
+        CPalSynchMgrController::PrepareForShutdown();
 
 #ifdef _DEBUG
-            PROCDumpThreadList();
+        PROCDumpThreadList();
 #endif
 
-            TRACE("About to suspend every other thread\n");
+        TRACE("About to suspend every other thread\n");
 
-            /* prevent other threads from acquiring signaled objects */
-            PROCCondemnOtherThreads();
-            /* prevent other threads from using services we're shutting down */
-            PROCSuspendOtherThreads();
-
-            TRACE("Every other thread suspended until exit\n");
-        }
-
-        /* Fall down for PALCLEANUP_ALL_STEPS */
-        if (PALCLEANUP_ALL_STEPS != step)
-            break;
-
-    case PALCLEANUP_STEP_TWO:
-        if (!step_done[PALCLEANUP_STEP_TWO])
-        {
-            step_done[PALCLEANUP_STEP_TWO] = 1;
-
-            /* LOADFreeeModules needs to be called before unitializing the rest
-               of the PAL since it could result in calling DllMain for loaded
-               libraries. For the user DllMain, all PAL APIs should still be
-               functional. */
-            LOADFreeModules(FALSE);
-
-#ifdef PAL_PERF
-            PERFDisableProcessProfile();
-            PERFDisableThreadProfile(FALSE);
-            PERFTerminate();  
-#endif
-
-            if (full_cleanup)
-            {
-                /* close primary handles of standard file objects */
-                FILECleanupStdHandles();
-                VIRTUALCleanup();
-                /* SEH requires information from the process structure to work;
-                   LOADFreeModules requires SEH to be functional when calling DllMain.
-                   Therefore SEHCleanup must go between LOADFreeModules and
-                   PROCCleanupInitialProcess */
-                SEHCleanup();
-                PROCCleanupInitialProcess();
-            }
-
-            // Object manager shutdown may cause all CPalThread objects
-            // to be deleted. Since the CPalThread of the shutdown thread
-            // needs to be available for reference by the thread suspension unsafe
-            // operations, the reference of CPalThread is incremented here
-            // to keep it alive until PAL finishes cleanup.
-            pThread->AddThreadReference();
-
-            //
-            // Shutdown object manager -- this needs to happen before the
-            // synch manager shutdown since it will call into the synch
-            // manager to free object synch data
-            // 
-            static_cast<CSharedMemoryObjectManager*>(g_pObjectManager)->Shutdown(pThread);
-
-            //
-            // Final synch manager shutdown
-            //
-            CPalSynchMgrController::Shutdown(pThread, full_cleanup);
-
-            if (full_cleanup)
-            {
-                /* It needs to be done after stopping the handle manager, because
-                   the cleanup will delete the critical section which is used
-                   when closing the handle of a file mapping */
-                MAPCleanup();
-                // MutexCleanup();
-
-                MiscCleanup();
-
-                TLSCleanup();
-            }
-
-            // The thread object will no longer be available after the shutdown thread
-            // releases the thread reference.
-            g_fThreadDataAvailable = FALSE;
-            pThread->ReleaseThreadReference();
-            pthread_setspecific(thObjKey, NULL); // Make sure any TLS entry is removed.
-
-            // Since thread object is no longer available here,
-            // the code path from here should stop using any functions
-            // that reference thread object.
-            SHMCleanup();
-
-            TRACE("PAL Terminated.\n");
-        }
-        break;
+        /* prevent other threads from acquiring signaled objects */
+        PROCCondemnOtherThreads();
+        /* prevent other threads from using services we're shutting down */
+        PROCSuspendOtherThreads();
 
-    default:
-        ASSERT("Unknown final cleanup step %d", step);
-        break;
+        TRACE("Every other thread suspended until exit\n");
     }
 }
 

src/pal/src/synchmgr/synchmanager.cpp

@@ -1836,7 +1836,7 @@ namespace CorUnix
     PAL_ERROR CPalSynchronizationManager::Shutdown(
         CPalThread *pthrCurrent,
         bool fFullCleanup)
-    {        
+    {
         PAL_ERROR palErr = NO_ERROR;
         CPalSynchronizationManager * pSynchManager = GetInstance();
 
@@ -1845,7 +1845,7 @@ namespace CorUnix
             _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());
@@ -1865,14 +1865,14 @@ namespace CorUnix
             pSynchManager->m_cacheThreadApcInfoNodes.Flush(pthrCurrent);
             pSynchManager->m_cacheOwnedObjectsListNodes.Flush(pthrCurrent);
 
-            InternalDeleteCriticalSection(&s_csSynchProcessLock);            
-            InternalDeleteCriticalSection(&s_csMonitoredProcessesLock);            
+            InternalDeleteCriticalSection(&s_csSynchProcessLock);
+            InternalDeleteCriticalSection(&s_csMonitoredProcessesLock);
         }
-                   
+
         s_lInitStatus = (LONG)SynchMgrStatusIdle;
         s_pObjSynchMgr = NULL;
-        
-    S_exit:        
+
+    S_exit:
         return palErr;
     }
 

src/pal/src/thread/process.cpp

@@ -1401,10 +1401,9 @@ void PROCCleanupProcess(BOOL bTerminateUnconditionally)
     /* Declare the beginning of shutdown */
     PALSetShutdownIntent();
 
-    PALCommonCleanup(PALCLEANUP_STEP_ONE, FALSE);
+    PALCommonCleanup(FALSE);
 
-    /* This must be called after PALCommonCleanup(PALCLEANUP_STEP_ONE, ...)
-     */
+    /* This must be called after PALCommonCleanup */
     PALShutdown();
 }