mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

terminateProcessId renamed

Browse source 
win32 upstream suggested a better name
This commit is contained in:
Joey Hess 2017-10-25 19:46:28 -04:00
parent 0ae2ac282e
commit 584dbfb892
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Restart.hs
View file

@ -27,7 +27,7 @@ import Control.Concurrent
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import System.Posix (signalProcess, sigTERM) import System.Posix (signalProcess, sigTERM)
#else #else
import System.Win32.Process (terminateProcessId) import System.Win32.Process (terminateProcessById)
#endif #endif
import Network.URI import Network.URI
@ -59,7 +59,7 @@ terminateSelf =
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
signalProcess sigTERM =<< getPID signalProcess sigTERM =<< getPID
#else #else
terminateProcessId =<< getPID terminateProcessById =<< getPID
#endif #endif
runRestart :: Assistant URLString runRestart :: Assistant URLString

4
Assistant/TransferSlots.hs
View file

@ -41,7 +41,7 @@ import qualified Control.Concurrent.MSemN as MSemN
import System.Posix.Process (getProcessGroupIDOf) import System.Posix.Process (getProcessGroupIDOf)
import System.Posix.Signals (signalProcessGroup, sigTERM, sigKILL) import System.Posix.Signals (signalProcessGroup, sigTERM, sigKILL)
#else #else
import System.Win32.Process (terminateProcessId) import System.Win32.Process (terminateProcessById)
#endif #endif
type TransferGenerator = Assistant (Maybe (Transfer, TransferInfo, Transferrer -> Assistant ())) type TransferGenerator = Assistant (Maybe (Transfer, TransferInfo, Transferrer -> Assistant ()))
@ -270,7 +270,7 @@ cancelTransfer pause t = do
threadDelay 50000 -- 0.05 second grace period threadDelay 50000 -- 0.05 second grace period
signal sigKILL signal sigKILL
#else #else
terminateProcessId pid terminateProcessById pid
#endif #endif
{- Start or resume a transfer. -} {- Start or resume a transfer. -}

4
Utility/Daemon.hs
View file

@ -14,7 +14,7 @@ import Utility.PID
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import Utility.LogFile import Utility.LogFile
#else #else
import System.Win32.Process (terminateProcessId) import System.Win32.Process (terminateProcessById)
import Utility.LockFile import Utility.LockFile
#endif #endif
@ -162,7 +162,7 @@ stopDaemon pidfile = go =<< checkDaemon pidfile
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
signalProcess sigTERM pid signalProcess sigTERM pid
#else #else
terminateProcessId pid terminateProcessById pid
#endif #endif
{- Windows locks a lock file that corresponds with the pid of the process. {- Windows locks a lock file that corresponds with the pid of the process.