char flags[CMD_LENGTH];\r
char dir[MAX_PATH];\r
bool stopping;\r
-CRITICAL_SECTION throttle_section;\r
-CONDITION_VARIABLE throttle_condition;\r
+unsigned long throttle_delay;\r
+HANDLE throttle_timer;\r
+LARGE_INTEGER throttle_duetime;\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
fprintf(stderr, "The full path to " NSSM " is too long!\n");\r
return 3;\r
}\r
- if (snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {\r
+ if (_snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {\r
fprintf(stderr, "Out of memory for ImagePath!\n");\r
return 4;\r
}\r
return;\r
}\r
\r
- /* Get startup parameters */\r
- int ret = get_parameters(argv[0], exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir));\r
- if (ret) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, argv[0], 0);\r
- service_status.dwCurrentState = SERVICE_STOPPED;\r
- /* An accurate, if not particularly helpful, status */\r
- service_status.dwWin32ExitCode = ERROR_SERVICE_NOT_ACTIVE;\r
- SetServiceStatus(service_handle, &service_status);\r
- return;\r
- }\r
-\r
service_status.dwCurrentState = SERVICE_START_PENDING;\r
- service_status.dwWaitHint = NSSM_RESET_THROTTLE_RESTART + NSSM_WAITHINT_MARGIN;\r
+ 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
set_service_recovery(service_name);\r
\r
/* Used for signalling a resume if the service pauses when throttled. */\r
- InitializeCriticalSection(&throttle_section);\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
monitor_service();\r
}\r
int ret = start_service();\r
if (ret) {\r
char code[16];\r
- snprintf(code, sizeof(code), "%d", ret);\r
+ _snprintf(code, sizeof(code), "%d", ret);\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);\r
return ret;\r
}\r
return NO_ERROR;\r
\r
case SERVICE_CONTROL_CONTINUE:\r
+ if (! throttle_timer) return ERROR_CALL_NOT_IMPLEMENTED;\r
throttle = 0;\r
- WakeConditionVariable(&throttle_condition);\r
+ ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
+ SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\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
PROCESS_INFORMATION pi;\r
ZeroMemory(&pi, sizeof(pi));\r
\r
+ /* Get startup parameters */\r
+ int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &throttle_delay);\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
+ }\r
+\r
/* Launch executable with arguments */\r
char cmd[CMD_LENGTH];\r
- if (_snprintf(cmd, sizeof(cmd), "%s %s", exe, flags) < 0) {\r
+ if (_snprintf(cmd, sizeof(cmd), "\"%s\" %s", exe, flags) < 0) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "command line", "start_service", 0);\r
return stop_service(2, true, true);\r
}\r
SetServiceStatus(service_handle, &service_status);\r
\r
/* Wait for a clean startup. */\r
- if (WaitForSingleObject(process_handle, NSSM_RESET_THROTTLE_RESTART) == WAIT_TIMEOUT) throttle = 0;\r
+ if (WaitForSingleObject(process_handle, throttle_delay) == WAIT_TIMEOUT) throttle = 0;\r
\r
return 0;\r
}\r
if (throttle > 7) throttle = 8;\r
\r
char threshold[8], milliseconds[8];\r
- _snprintf(threshold, sizeof(threshold), "%d", NSSM_RESET_THROTTLE_RESTART);\r
+ _snprintf(threshold, sizeof(threshold), "%d", throttle_delay);\r
_snprintf(milliseconds, sizeof(milliseconds), "%d", ms);\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service_name, threshold, milliseconds, 0);\r
\r
- EnterCriticalSection(&throttle_section);\r
+ 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
+ }\r
\r
service_status.dwCurrentState = SERVICE_PAUSED;\r
SetServiceStatus(service_handle, &service_status);\r
\r
- SleepConditionVariableCS(&throttle_condition, &throttle_section, ms);\r
-\r
- LeaveCriticalSection(&throttle_section);\r
+ if (throttle_timer) WaitForSingleObject(throttle_timer, INFINITE);\r
+ else Sleep(ms);\r
}\r