Cleanup (squash)

Author: adityamandaleeka

src/pal/src/synchmgr/synchmanager.cpp

@@ -38,7 +38,7 @@ Module Name:
 // We use the synchronization manager's worker thread to handle
 // process termination requests. It does so by calling the
 // registered handler function.
-PTERMINATION_REQUEST_HANDLER g_terminationRequestHandler = nullptr;
+PTERMINATION_REQUEST_HANDLER g_terminationRequestHandler = NULL;
 
 // Set the handler for process termination requests.
 VOID PALAPI PAL_SetTerminationRequestHandler(
@@ -180,9 +180,9 @@ namespace CorUnix
     Method:
       CPalSynchronizationManager::BlockThread
 
-    Call by a thread to go to sleep for a wait or a sleep
+    Called by a thread to go to sleep for a wait or a sleep
 
-    NOTE: This methot must must be called without holding any 
+    NOTE: This method must must be called without holding any 
           synchronization lock (as well as other locks) 
     --*/
     PAL_ERROR CPalSynchronizationManager::BlockThread(
@@ -200,7 +200,7 @@ namespace CorUnix
         DWORD dwSigObjIdx = 0;
         bool fRaceAlerted = false;
         bool fEarlyDeath = false;
-            
+
         pdwWaitState = SharedIDToTypePointer(DWORD,
                 pthrCurrent->synchronizationInfo.m_shridWaitAwakened);
 
@@ -234,7 +234,7 @@ namespace CorUnix
                     // native wait
                     fRaceAlerted = true;
                 }
-            }                
+            }
 
             if (!fRaceAlerted)
             {
@@ -277,7 +277,7 @@ namespace CorUnix
                 }
             }
 
-            if (fAlertable) 
+            if (fAlertable)
             {
                 // Unlock
                 ReleaseSharedSynchLock(pthrCurrent);
@@ -486,7 +486,7 @@ namespace CorUnix
             if (ETIMEDOUT == iWaitRet)
             {
                 _ASSERT_MSG(INFINITE != dwTimeout,
-                            "Got a ETIMEDOUT despite timeout was INFINITE\n");                    
+                            "Got ETIMEDOUT despite timeout being INFINITE\n");
                 break;
             }
             else if (0 != iWaitRet)
@@ -529,7 +529,7 @@ namespace CorUnix
         }
 
         _ASSERT_MSG(ETIMEDOUT != iRet || INFINITE != dwTimeout,
-                    "Got time out return code with INFINITE timeout\n");
+                    "Got timeout return code with INFINITE timeout\n");
 
         if (0 == iWaitRet)
         {
@@ -787,8 +787,8 @@ namespace CorUnix
                                              rgObjects,
                                              dwObjectCount,
                                              (void **)rgControllers,
-                                             CSynchControllerBase::WaitController);                                                     
-    }                                
+                                             CSynchControllerBase::WaitController);
+    }
 
     /*++
     Method:
@@ -808,7 +808,7 @@ namespace CorUnix
                                              dwObjectCount,
                                              (void **)rgControllers,
                                              CSynchControllerBase::StateController);
-    }                                
+    }
 
     /*++
     Method:
@@ -1059,9 +1059,9 @@ namespace CorUnix
             if (NULLSharedID == shridSynchData)
             {
                 ERROR("Unable to allocate shared memory\n");
-                palErr = ERROR_NOT_ENOUGH_MEMORY;
-                goto AOSD_exit;
+                return ERROR_NOT_ENOUGH_MEMORY;
             }
+
             psdSynchData = SharedIDToTypePointer(CSynchData, shridSynchData);
 
             VALIDATEOBJECT(psdSynchData);
@@ -1074,7 +1074,7 @@ namespace CorUnix
 
             // Store shared pointer to this object
             psdSynchData->SetSharedThis(shridSynchData);
-            
+
             *ppvSynchData = reinterpret_cast<void *>(shridSynchData);
         }
         else
@@ -1083,10 +1083,9 @@ namespace CorUnix
             if (NULL == psdSynchData)
             {
                 ERROR("Unable to allocate memory\n");
-                palErr = ERROR_NOT_ENOUGH_MEMORY;
-                goto AOSD_exit;
+                return ERROR_NOT_ENOUGH_MEMORY;
             }
-            
+
             // Initialize waiting list pointers
             psdSynchData->SetWTLHeadPtr(NULL);
             psdSynchData->SetWTLTailPtr(NULL);
@@ -1095,16 +1094,15 @@ namespace CorUnix
             psdSynchData->SetSharedThis(NULLSharedID);
 
             *ppvSynchData = static_cast<void *>(psdSynchData);
-        }        
+        }
 
         // Initialize object domain and object type;
         psdSynchData->SetObjectDomain(odObjectDomain);
         psdSynchData->SetObjectType(potObjectType);
 
-    AOSD_exit:
         return palErr;
-    }                                
-    
+    }
+
     /*++
     Method:
       CPalSynchronizationManager::FreeObjectSynchData
@@ -1127,10 +1125,11 @@ namespace CorUnix
         {
             psdSynchData = SharedIDToTypePointer(CSynchData,
                 reinterpret_cast<SharedID>(pvSynchData));
+
             if (NULL == psdSynchData)
             {
                 ASSERT("Bad shared memory pointer\n");
-                goto FOSD_exit;
+                return;
             }
         }
         else
@@ -1139,9 +1138,6 @@ namespace CorUnix
         }
 
         psdSynchData->Release(pthrCurrent);
-
-    FOSD_exit:
-        return;
     }
 
     /*++
@@ -1843,7 +1839,7 @@ namespace CorUnix
     DWORD TerminationRequestHandlingRoutine(LPVOID pArg)
     {
         // Call the termination request handler if one is registered.
-        if (g_terminationRequestHandler != nullptr)
+        if (g_terminationRequestHandler != NULL)
         {
             g_terminationRequestHandler();
         }
@@ -1890,7 +1886,7 @@ namespace CorUnix
                 case SynchWorkerCmdTerminationRequest:
                     // This worker thread is being asked to initiate process termination
 
-                    HANDLE hShutdownThread;
+                    HANDLE hTerminationRequestHandlingThread;
                     palErr = InternalCreateThread(pthrWorker,
                                       NULL,
                                       0,
@@ -1899,13 +1895,18 @@ namespace CorUnix
                                       0,
                                       PalWorkerThread,
                                       NULL,
-                                      &hShutdownThread);
+                                      &hTerminationRequestHandlingThread);
 
                     if (NO_ERROR != palErr)
                     {
                         ERROR("Unable to create worker thread\n");
                     }
 
+                    if (hTerminationRequestHandlingThread != NULL)
+                    {
+                        CloseHandle(hTerminationRequestHandlingThread);
+                    }
+
                     break;
                 case SynchWorkerCmdNop:
                     TRACE("Synch Worker: received SynchWorkerCmdNop\n");