Added await_shutdown() function.
[nssm.git] / service.cpp
index fd25163..028b035 100644 (file)
@@ -1,5 +1,6 @@
 #include "nssm.h"\r
 \r
+bool is_admin;\r
 SERVICE_STATUS service_status;\r
 SERVICE_STATUS_HANDLE service_handle;\r
 HANDLE process_handle;\r
@@ -10,9 +11,20 @@ char exe[EXE_LENGTH];
 char flags[CMD_LENGTH];\r
 char dir[MAX_PATH];\r
 bool stopping;\r
+bool allow_restart;\r
 unsigned long throttle_delay;\r
+unsigned long stop_method;\r
+unsigned long kill_console_delay;\r
+unsigned long kill_window_delay;\r
+unsigned long kill_threads_delay;\r
+CRITICAL_SECTION throttle_section;\r
+CONDITION_VARIABLE throttle_condition;\r
 HANDLE throttle_timer;\r
 LARGE_INTEGER throttle_duetime;\r
+bool use_critical_section;\r
+FILETIME creation_time;\r
+\r
+extern imports_t imports;\r
 \r
 static enum { NSSM_EXIT_RESTART, NSSM_EXIT_IGNORE, NSSM_EXIT_REALLY, NSSM_EXIT_UNCLEAN } exit_actions;\r
 static const char *exit_action_strings[] = { "Restart", "Ignore", "Exit", "Suicide", 0 };\r
@@ -29,7 +41,7 @@ static inline int throttle_milliseconds() {
 SC_HANDLE open_service_manager() {\r
   SC_HANDLE ret = OpenSCManager(0, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ALL_ACCESS);\r
   if (! ret) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENSCMANAGER_FAILED, 0);\r
+    if (is_admin) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENSCMANAGER_FAILED, 0);\r
     return 0;\r
   }\r
 \r
@@ -38,7 +50,7 @@ SC_HANDLE open_service_manager() {
 \r
 /* About to install the service */\r
 int pre_install_service(int argc, char **argv) {\r
-  /* Show the dialogue box if we didn't give the */\r
+  /* Show the dialogue box if we didn't give the service name and path */\r
   if (argc < 2) return nssm_gui(IDD_INSTALL, argv[0]);\r
 \r
   /* Arguments are optional */\r
@@ -77,7 +89,7 @@ int pre_remove_service(int argc, char **argv) {
   /* Show dialogue box if we didn't pass service name and "confirm" */\r
   if (argc < 2) return nssm_gui(IDD_REMOVE, argv[0]);\r
   if (str_equiv(argv[1], "confirm")) return remove_service(argv[0]);\r
-  fprintf(stderr, "To remove a service without confirmation: nssm remove <servicename> confirm\n");\r
+  print_message(stderr, NSSM_MESSAGE_PRE_REMOVE_SERVICE);\r
   return 100;\r
 }\r
 \r
@@ -86,10 +98,10 @@ int install_service(char *name, char *exe, char *flags) {
   /* Open service manager */\r
   SC_HANDLE services = open_service_manager();\r
   if (! services) {\r
-    fprintf(stderr, "Error opening service manager!\n");\r
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);\r
     return 2;\r
   }\r
-  \r
+\r
   /* Get path of this program */\r
   char path[MAX_PATH];\r
   GetModuleFileName(0, path, MAX_PATH);\r
@@ -98,11 +110,11 @@ int install_service(char *name, char *exe, char *flags) {
   char command[CMD_LENGTH];\r
   size_t pathlen = strlen(path);\r
   if (pathlen + 1 >= VALUE_LENGTH) {\r
-    fprintf(stderr, "The full path to " NSSM " is too long!\n");\r
+    print_message(stderr, NSSM_MESSAGE_PATH_TOO_LONG, NSSM);\r
     return 3;\r
   }\r
-  if (_snprintf(command, sizeof(command), "\"%s\"", path) < 0) {\r
-    fprintf(stderr, "Out of memory for ImagePath!\n");\r
+  if (_snprintf_s(command, sizeof(command), _TRUNCATE, "\"%s\"", path) < 0) {\r
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY_FOR_IMAGEPATH);\r
     return 4;\r
   }\r
 \r
@@ -117,24 +129,26 @@ int install_service(char *name, char *exe, char *flags) {
   /* Create the service */\r
   SC_HANDLE service = CreateService(services, name, name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, command, 0, 0, 0, 0, 0);\r
   if (! service) {\r
-    fprintf(stderr, "Error creating service!\n");\r
+    print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED);\r
     CloseServiceHandle(services);\r
     return 5;\r
   }\r
 \r
   /* Now we need to put the parameters into the registry */\r
   if (create_parameters(name, exe, flags, dir)) {\r
-    fprintf(stderr, "Error setting startup parameters for the service!\n");\r
+    print_message(stderr, NSSM_MESSAGE_CREATE_PARAMETERS_FAILED);\r
     DeleteService(service);\r
     CloseServiceHandle(services);\r
     return 6;\r
   }\r
 \r
+  set_service_recovery(service, name);\r
+\r
   /* Cleanup */\r
   CloseServiceHandle(service);\r
   CloseServiceHandle(services);\r
 \r
-  printf("Service \"%s\" installed successfully!\n", name);\r
+  print_message(stdout, NSSM_MESSAGE_SERVICE_INSTALLED, name);\r
   return 0;\r
 }\r
 \r
@@ -143,21 +157,21 @@ int remove_service(char *name) {
   /* Open service manager */\r
   SC_HANDLE services = open_service_manager();\r
   if (! services) {\r
-    fprintf(stderr, "Error opening service manager!\n");\r
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);\r
     return 2;\r
   }\r
-  \r
+\r
   /* Try to open the service */\r
   SC_HANDLE service = OpenService(services, name, SC_MANAGER_ALL_ACCESS);\r
   if (! service) {\r
-    fprintf(stderr, "Can't open service!");\r
+    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED);\r
     CloseServiceHandle(services);\r
     return 3;\r
   }\r
 \r
   /* Try to delete the service */\r
   if (! DeleteService(service)) {\r
-    fprintf(stderr, "Error deleting service!\n");\r
+    print_message(stderr, NSSM_MESSAGE_DELETESERVICE_FAILED);\r
     CloseServiceHandle(service);\r
     CloseServiceHandle(services);\r
     return 4;\r
@@ -167,17 +181,21 @@ int remove_service(char *name) {
   CloseServiceHandle(service);\r
   CloseServiceHandle(services);\r
 \r
-  printf("Service \"%s\" removed successfully!\n", name);\r
+  print_message(stdout, NSSM_MESSAGE_SERVICE_REMOVED, name);\r
   return 0;\r
 }\r
 \r
 /* Service initialisation */\r
 void WINAPI service_main(unsigned long argc, char **argv) {\r
-  if (_snprintf(service_name, sizeof(service_name), "%s", argv[0]) < 0) {\r
+  if (_snprintf_s(service_name, sizeof(service_name), _TRUNCATE, "%s", argv[0]) < 0) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "service_name", "service_main()", 0);\r
     return;\r
   }\r
 \r
+  /* We can use a condition variable in a critical section on Vista or later. */\r
+  if (imports.SleepConditionVariableCS && imports.WakeConditionVariable) use_critical_section = true;\r
+  else use_critical_section = false;\r
+\r
   /* Initialise status */\r
   ZeroMemory(&service_status, sizeof(service_status));\r
   service_status.dwServiceType = SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS;\r
@@ -204,35 +222,54 @@ void WINAPI service_main(unsigned long argc, char **argv) {
   service_status.dwWaitHint = throttle_delay + NSSM_WAITHINT_MARGIN;\r
   SetServiceStatus(service_handle, &service_status);\r
 \r
-  /* Try to create the exit action parameters; we don't care if it fails */\r
-  create_exit_action(argv[0], exit_action_strings[0]);\r
+  if (is_admin) {\r
+    /* Try to create the exit action parameters; we don't care if it fails */\r
+    create_exit_action(argv[0], exit_action_strings[0]);\r
 \r
-  set_service_recovery(service_name);\r
+    set_service_recovery(0, service_name);\r
+  }\r
 \r
   /* Used for signalling a resume if the service pauses when throttled. */\r
-  throttle_timer = CreateWaitableTimer(0, 1, 0);\r
-  if (! throttle_timer) {\r
-    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_CREATEWAITABLETIMER_FAILED, service_name, error_string(GetLastError()), 0);\r
+  if (use_critical_section) InitializeCriticalSection(&throttle_section);\r
+  else {\r
+    throttle_timer = CreateWaitableTimer(0, 1, 0);\r
+    if (! throttle_timer) {\r
+      log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_CREATEWAITABLETIMER_FAILED, service_name, error_string(GetLastError()), 0);\r
+    }\r
   }\r
 \r
   monitor_service();\r
 }\r
 \r
 /* Make sure service recovery actions are taken where necessary */\r
-void set_service_recovery(char *service_name) {\r
-  SC_HANDLE services = open_service_manager();\r
-  if (! services) return;\r
+void set_service_recovery(SC_HANDLE service, char *service_name) {\r
+  SC_HANDLE services = 0;\r
+\r
+  if (! service) {\r
+    services = open_service_manager();\r
+    if (! services) return;\r
 \r
-  SC_HANDLE service = OpenService(services, service_name, SC_MANAGER_ALL_ACCESS);\r
-  if (! service) return;\r
-  return;\r
+    service = OpenService(services, service_name, SC_MANAGER_ALL_ACCESS);\r
+    if (! service) return;\r
+  }\r
 \r
   SERVICE_FAILURE_ACTIONS_FLAG flag;\r
   ZeroMemory(&flag, sizeof(flag));\r
   flag.fFailureActionsOnNonCrashFailures = true;\r
 \r
   /* This functionality was added in Vista so the call may fail */\r
-  ChangeServiceConfig2(service, SERVICE_CONFIG_FAILURE_ACTIONS_FLAG, &flag);\r
+  if (! ChangeServiceConfig2(service, SERVICE_CONFIG_FAILURE_ACTIONS_FLAG, &flag)) {\r
+    unsigned long error = GetLastError();\r
+    /* Pre-Vista we expect to fail with ERROR_INVALID_LEVEL */\r
+    if (error != ERROR_INVALID_LEVEL) {\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CHANGESERVICECONFIG2_FAILED, service_name, error_string(error), 0);\r
+    }\r
+  }\r
+\r
+  if (services) {\r
+    CloseServiceHandle(service);\r
+    CloseServiceHandle(services);\r
+  }\r
 }\r
 \r
 int monitor_service() {\r
@@ -240,13 +277,13 @@ int monitor_service() {
   int ret = start_service();\r
   if (ret) {\r
     char code[16];\r
-    _snprintf(code, sizeof(code), "%d", ret);\r
+    _snprintf_s(code, sizeof(code), _TRUNCATE, "%d", ret);\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);\r
     return ret;\r
   }\r
   log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_STARTED_SERVICE, exe, flags, service_name, dir, 0);\r
 \r
-  /* Monitor service service */\r
+  /* Monitor service */\r
   if (! RegisterWaitForSingleObject(&wait_handle, process_handle, end_service, (void *) pid, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)) {\r
     log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service_name, exe, error_string(GetLastError()), 0);\r
   }\r
@@ -275,11 +312,11 @@ void log_service_control(char *service_name, unsigned long control, bool handled
     /* "0x" + 8 x hex + NULL */\r
     text = (char *) HeapAlloc(GetProcessHeap(), 0, 11);\r
     if (! text) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control", 0);\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control()", 0);\r
       return;\r
     }\r
-    if (_snprintf(text, 11, "0x%08x", control) < 0) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control", 0);\r
+    if (_snprintf_s(text, 11, _TRUNCATE, "0x%08x", control) < 0) {\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control()", 0);\r
       HeapFree(GetProcessHeap(), 0, text);\r
       return;\r
     }\r
@@ -299,6 +336,10 @@ void log_service_control(char *service_name, unsigned long control, bool handled
 /* Service control handler */\r
 unsigned long WINAPI service_control_handler(unsigned long control, unsigned long event, void *data, void *context) {\r
   switch (control) {\r
+    case SERVICE_CONTROL_INTERROGATE:\r
+      /* We always keep the service status up-to-date so this is a no-op. */\r
+      return NO_ERROR;\r
+\r
     case SERVICE_CONTROL_SHUTDOWN:\r
     case SERVICE_CONTROL_STOP:\r
       log_service_control(service_name, control, true);\r
@@ -307,10 +348,13 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
 \r
     case SERVICE_CONTROL_CONTINUE:\r
       log_service_control(service_name, control, true);\r
-      if (! throttle_timer) return ERROR_CALL_NOT_IMPLEMENTED;\r
       throttle = 0;\r
-      ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
-      SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
+      if (use_critical_section) imports.WakeConditionVariable(&throttle_condition);\r
+      else {\r
+        if (! throttle_timer) return ERROR_CALL_NOT_IMPLEMENTED;\r
+        ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
+        SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
+      }\r
       service_status.dwCurrentState = SERVICE_CONTINUE_PENDING;\r
       service_status.dwWaitHint = throttle_milliseconds() + NSSM_WAITHINT_MARGIN;\r
       log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_RESET_THROTTLE, service_name, 0);\r
@@ -334,6 +378,7 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
 /* Start the service */\r
 int start_service() {\r
   stopping = false;\r
+  allow_restart = true;\r
 \r
   if (process_handle) return 0;\r
 \r
@@ -348,7 +393,7 @@ int start_service() {
 \r
   /* Get startup parameters */\r
   char *env = 0;\r
-  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay);\r
+  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay, &stop_method, &kill_console_delay, &kill_window_delay, &kill_threads_delay, &si);\r
   if (ret) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, service_name, 0);\r
     return stop_service(2, true, true);\r
@@ -356,34 +401,45 @@ int start_service() {
 \r
   /* Launch executable with arguments */\r
   char cmd[CMD_LENGTH];\r
-  if (_snprintf(cmd, sizeof(cmd), "\"%s\" %s", exe, flags) < 0) {\r
+  if (_snprintf_s(cmd, sizeof(cmd), _TRUNCATE, "\"%s\" %s", exe, flags) < 0) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "command line", "start_service", 0);\r
+    close_output_handles(&si);\r
     return stop_service(2, true, true);\r
   }\r
 \r
   throttle_restart();\r
 \r
-  if (! CreateProcess(0, cmd, 0, 0, false, 0, env, dir, &si, &pi)) {\r
+  bool inherit_handles = false;\r
+  if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
+  if (! CreateProcess(0, cmd, 0, 0, inherit_handles, 0, env, dir, &si, &pi)) {\r
     unsigned long error = GetLastError();\r
     if (error == ERROR_INVALID_PARAMETER && env) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service_name, exe, NSSM_REG_ENV, 0);\r
     else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, error_string(error), 0);\r
+    close_output_handles(&si);\r
     return stop_service(3, true, true);\r
   }\r
   process_handle = pi.hProcess;\r
   pid = pi.dwProcessId;\r
 \r
-  /* Signal successful start */\r
-  service_status.dwCurrentState = SERVICE_RUNNING;\r
-  SetServiceStatus(service_handle, &service_status);\r
+  if (get_process_creation_time(process_handle, &creation_time)) ZeroMemory(&creation_time, sizeof(creation_time));\r
+\r
+  close_output_handles(&si);\r
 \r
   /* Wait for a clean startup. */\r
   if (WaitForSingleObject(process_handle, throttle_delay) == WAIT_TIMEOUT) throttle = 0;\r
 \r
+  /* Signal successful start */\r
+  service_status.dwCurrentState = SERVICE_RUNNING;\r
+  SetServiceStatus(service_handle, &service_status);\r
+\r
   return 0;\r
 }\r
 \r
 /* Stop the service */\r
 int stop_service(unsigned long exitcode, bool graceful, bool default_action) {\r
+  allow_restart = false;\r
+  if (wait_handle) UnregisterWait(wait_handle);\r
+\r
   if (default_action && ! exitcode && ! graceful) {\r
     log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service_name, exe, exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_REALLY] ,0);\r
     graceful = true;\r
@@ -392,16 +448,18 @@ int stop_service(unsigned long exitcode, bool graceful, bool default_action) {
   /* Signal we are stopping */\r
   if (graceful) {\r
     service_status.dwCurrentState = SERVICE_STOP_PENDING;\r
-    service_status.dwWaitHint = NSSM_KILL_WINDOW_GRACE_PERIOD + NSSM_KILL_THREADS_GRACE_PERIOD + NSSM_WAITHINT_MARGIN;\r
+    service_status.dwWaitHint = NSSM_WAITHINT_MARGIN;\r
+    if (stop_method & NSSM_STOP_METHOD_CONSOLE && imports.AttachConsole) service_status.dwWaitHint += kill_console_delay;\r
+    if (stop_method & NSSM_STOP_METHOD_WINDOW) service_status.dwWaitHint += kill_window_delay;\r
+    if (stop_method & NSSM_STOP_METHOD_THREADS) service_status.dwWaitHint += kill_threads_delay;\r
     SetServiceStatus(service_handle, &service_status);\r
   }\r
 \r
-  /* Nothing to do if server isn't running */\r
+  /* Nothing to do if service isn't running */\r
   if (pid) {\r
-    /* Shut down server */\r
+    /* Shut down service */\r
     log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_TERMINATEPROCESS, service_name, exe, 0);\r
-    kill_process(service_name, process_handle, pid, 0);\r
-    process_handle = 0;\r
+    kill_process(service_name, stop_method, process_handle, pid, 0);\r
   }\r
   else log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_PROCESS_ALREADY_STOPPED, service_name, exe, 0);\r
 \r
@@ -434,10 +492,24 @@ void CALLBACK end_service(void *arg, unsigned char why) {
 \r
   /* Check exit code */\r
   unsigned long exitcode = 0;\r
+  char code[16];\r
+  FILETIME exit_time;\r
   GetExitCodeProcess(process_handle, &exitcode);\r
+  if (exitcode == STILL_ACTIVE || get_process_exit_time(process_handle, &exit_time)) GetSystemTimeAsFileTime(&exit_time);\r
+  CloseHandle(process_handle);\r
+\r
+  /*\r
+    Log that the service ended BEFORE logging about killing the process\r
+    tree.  See below for the possible values of the why argument.\r
+  */\r
+  if (! why) {\r
+    _snprintf_s(code, sizeof(code), _TRUNCATE, "%lu", exitcode);\r
+    log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ENDED_SERVICE, exe, service_name, code, 0);\r
+  }\r
 \r
   /* Clean up. */\r
-  kill_process_tree(service_name, pid, exitcode, pid);\r
+  if (exitcode == STILL_ACTIVE) exitcode = 0;\r
+  kill_process_tree(service_name, stop_method, pid, exitcode, pid, &creation_time, &exit_time);\r
 \r
   /*\r
     The why argument is true if our wait timed out or false otherwise.\r
@@ -446,10 +518,7 @@ void CALLBACK end_service(void *arg, unsigned char why) {
     this is a controlled shutdown, and don't take any restart action.\r
   */\r
   if (why) return;\r
-\r
-  char code[16];\r
-  _snprintf(code, sizeof(code), "%d", exitcode);\r
-  log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ENDED_SERVICE, exe, service_name, code, 0);\r
+  if (! allow_restart) return;\r
 \r
   /* What action should we take? */\r
   int action = NSSM_EXIT_RESTART;\r
@@ -491,7 +560,9 @@ void CALLBACK end_service(void *arg, unsigned char why) {
     /* Fake a crash so pre-Vista service managers will run recovery actions. */\r
     case NSSM_EXIT_UNCLEAN:\r
       log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_UNCLEAN, service_name, code, exit_action_strings[action], 0);\r
-      exit(stop_service(exitcode, false, default_action));\r
+      stop_service(exitcode, false, default_action);\r
+      free_imports();\r
+      exit(exitcode);\r
     break;\r
   }\r
 }\r
@@ -505,11 +576,12 @@ void throttle_restart() {
   if (throttle > 7) throttle = 8;\r
 \r
   char threshold[8], milliseconds[8];\r
-  _snprintf(threshold, sizeof(threshold), "%d", throttle_delay);\r
-  _snprintf(milliseconds, sizeof(milliseconds), "%d", ms);\r
+  _snprintf_s(threshold, sizeof(threshold), _TRUNCATE, "%lu", throttle_delay);\r
+  _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%lu", ms);\r
   log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service_name, threshold, milliseconds, 0);\r
 \r
-  if (throttle_timer) {\r
+  if (use_critical_section) EnterCriticalSection(&throttle_section);\r
+  else if (throttle_timer) {\r
     ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
     throttle_duetime.QuadPart = 0 - (ms * 10000LL);\r
     SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
@@ -518,6 +590,98 @@ void throttle_restart() {
   service_status.dwCurrentState = SERVICE_PAUSED;\r
   SetServiceStatus(service_handle, &service_status);\r
 \r
-  if (throttle_timer) WaitForSingleObject(throttle_timer, INFINITE);\r
-  else Sleep(ms);\r
+  if (use_critical_section) {\r
+    imports.SleepConditionVariableCS(&throttle_condition, &throttle_section, ms);\r
+    LeaveCriticalSection(&throttle_section);\r
+  }\r
+  else {\r
+    if (throttle_timer) WaitForSingleObject(throttle_timer, INFINITE);\r
+    else Sleep(ms);\r
+  }\r
+}\r
+\r
+/*\r
+  When responding to a stop (or any other) request we need to set dwWaitHint to\r
+  the number of milliseconds we expect the operation to take, and optionally\r
+  increase dwCheckPoint.  If dwWaitHint milliseconds elapses without the\r
+  operation completing or dwCheckPoint increasing, the system will consider the\r
+  service to be hung.\r
+\r
+  However the system will consider the service to be hung after 30000\r
+  milliseconds regardless of the value of dwWaitHint if dwCheckPoint has not\r
+  changed.  Therefore if we want to wait longer than that we must periodically\r
+  increase dwCheckPoint.\r
+\r
+  Furthermore, it will consider the service to be hung after 60000 milliseconds\r
+  regardless of the value of dwCheckPoint unless dwWaitHint is increased every\r
+  time dwCheckPoint is also increased.\r
+\r
+  Our strategy then is to retrieve the initial dwWaitHint and wait for\r
+  NSSM_SHUTDOWN_CHECKPOINT milliseconds.  If the process is still running and\r
+  we haven't finished waiting we increment dwCheckPoint and add whichever is\r
+  smaller of NSSM_SHUTDOWN_CHECKPOINT or the remaining timeout to dwWaitHint.\r
+\r
+  Only doing both these things will prevent the system from killing the service.\r
+\r
+  Returns: 1 if the wait timed out.\r
+           0 if the wait completed.\r
+          -1 on error.\r
+*/\r
+int await_shutdown(char *function_name, char *service_name, SERVICE_STATUS_HANDLE service_handle, SERVICE_STATUS *service_status, HANDLE process_handle, unsigned long timeout) {\r
+  unsigned long interval;\r
+  unsigned long waithint;\r
+  unsigned long ret;\r
+  unsigned long waited;\r
+  char interval_milliseconds[16];\r
+  char timeout_milliseconds[16];\r
+  char waited_milliseconds[16];\r
+  char *function = function_name;\r
+\r
+  /* Add brackets to function name. */\r
+  size_t funclen = strlen(function_name) + 3;\r
+  char *func = (char *) HeapAlloc(GetProcessHeap(), 0, funclen);\r
+  if (func) {\r
+    if (_snprintf_s(func, funclen, _TRUNCATE, "%s()", function_name) > -1) function = func;\r
+  }\r
+\r
+  _snprintf_s(timeout_milliseconds, sizeof(timeout_milliseconds), _TRUNCATE, "%lu", timeout);\r
+\r
+  waithint = service_status->dwWaitHint;\r
+  waited = 0;\r
+  while (waited < timeout) {\r
+    interval = timeout - waited;\r
+    if (interval > NSSM_SHUTDOWN_CHECKPOINT) interval = NSSM_SHUTDOWN_CHECKPOINT;\r
+\r
+    service_status->dwCurrentState = SERVICE_STOP_PENDING;\r
+    service_status->dwWaitHint += interval;\r
+    service_status->dwCheckPoint++;\r
+    SetServiceStatus(service_handle, service_status);\r
+\r
+    if (waited) {\r
+      _snprintf_s(waited_milliseconds, sizeof(waited_milliseconds), _TRUNCATE, "%lu", waited);\r
+      _snprintf_s(interval_milliseconds, sizeof(interval_milliseconds), _TRUNCATE, "%lu", interval);\r
+      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_AWAITING_SHUTDOWN, function, service_name, waited_milliseconds, interval_milliseconds, timeout_milliseconds, 0);\r
+    }\r
+\r
+    switch (WaitForSingleObject(process_handle, interval)) {\r
+      case WAIT_OBJECT_0:\r
+        ret = 0;\r
+        goto awaited;\r
+\r
+      case WAIT_TIMEOUT:\r
+        ret = 1;\r
+      break;\r
+\r
+      default:\r
+        ret = -1;\r
+        goto awaited;\r
+    }\r
+\r
+    waited += interval;\r
+  }\r
+\r
+awaited:\r
+  if (func) HeapFree(GetProcessHeap(), 0, func);\r
+\r
+  return ret;\r
 }\r