vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ycmd watchog timer now wiser about machine sleep

Browse Source 
We now make sure we don't terminate ycmd if we skipped a watchdog wakeup
time. If we skipped a check, that means the machine probably went to sleep and
the client might still actually be up. In such cases, we give it one more wait
interval to contact us before we die.
This commit is contained in:
Strahinja Val Markovic 2014-03-20 15:44:35 -07:00
parent 5619c00487
commit 4adf71969d
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python/ycm/server/watchdog_plugin.py
View File

@ -44,6 +44,10 @@ class WatchdogPlugin( object ):
check_interval_seconds = 60 * 10 ): check_interval_seconds = 60 * 10 ):
self._check_interval_seconds = check_interval_seconds self._check_interval_seconds = check_interval_seconds
self._idle_suicide_seconds = idle_suicide_seconds self._idle_suicide_seconds = idle_suicide_seconds
# No need for a lock on wakeup time since only the watchdog thread ever
# reads or sets it.
self._last_wakeup_time = time.time()
self._last_request_time = time.time() self._last_request_time = time.time()
self._last_request_time_lock = Lock() self._last_request_time_lock = Lock()
if idle_suicide_seconds <= 0: if idle_suicide_seconds <= 0:
@ -63,12 +67,32 @@ class WatchdogPlugin( object ):
self._last_request_time = new_value self._last_request_time = new_value
def _TimeSinceLastRequest( self ):
return time.time() - self._GetLastRequestTime()
def _TimeSinceLastWakeup( self ):
return time.time() - self._last_wakeup_time()
def _UpdateLastWakeupTime( self ):
self._last_wakeup_time = time.time()
def _WatchdogMain( self ): def _WatchdogMain( self ):
while True: while True:
time.sleep( self._check_interval_seconds ) time.sleep( self._check_interval_seconds )
if time.time() - self._GetLastRequestTime() > self._idle_suicide_seconds:
# We make sure we don't terminate if we skipped a wakeup time. If we
# skipped a check, that means the machine probably went to sleep and the
# client might still actually be up. In such cases, we give it one more
# wait interval to contact us before we die.
if (self._TimeSinceLastRequest() > self._idle_suicide_seconds and
self._TimeSinceLastWakeup() < 2 * self._check_interval_seconds):
utils.TerminateProcess( os.getpid() ) utils.TerminateProcess( os.getpid() )
self._UpdateLastWakeupTime()
def __call__( self, callback ): def __call__( self, callback ):
def wrapper( *args, **kwargs ): def wrapper( *args, **kwargs ):