Changeset 27780

Timestamp:

12/15/2009 10:17:02 AM (9 months ago)

Author:

exarkun

Message:

Merge forward, resolve numerous conflicts

Location:

branches/signal-process-group-2726-4/twisted

Files:

• internet/_dumbwin32proc.py (modified) (5 diffs)
• internet/interfaces.py (modified) (2 diffs)
• internet/process.py (modified) (1 diff)
• test/mock_win32process.py (modified) (1 diff)
• test/process_signalgroup.py (copied) (copied from branches/signal-process-group-2726-3/twisted/test/process_signalgroup.py)
• test/process_signaljob.py (copied) (copied from branches/signal-process-group-2726-3/twisted/test/process_signaljob.py)
• test/test_process.py (modified) (5 diffs)

branches/signal-process-group-2726-4/twisted/internet/_dumbwin32proc.py

@@ -17 +17 @@
 import win32process
 import win32security
+import win32job
 
 import pywintypes
@@ -35 +36 @@
 from twisted.internet._baseprocess import BaseProcess
 
-def debug(msg):
-    import sys
-    print msg
-    sys.stdout.flush()
+
 
 class _Reaper(_pollingfile._PollableResource):
@@ -169 +167 @@
 
         cmdline = quoteArguments(args)
+
+        self.job = win32job.CreateJobObject(None, None)
         # TODO: error detection here.
         def doCreate():
             self.hProcess, self.hThread, self.pid, dwTid = win32process.CreateProcess(
-                command, cmdline, None, None, 1, 0, env, path, StartupInfo)
+                command, cmdline, None, None, 1, win32con.CREATE_SUSPENDED,
+                env, path, StartupInfo)
         try:
             doCreate()
@@ -206 +207 @@
                         raise OSError(pwte2)
 
+        win32job.AssignProcessToJobObject(self.job, self.hProcess)
+        win32process.ResumeThread(self.hThread)
+
+        win32file.CloseHandle(self.hThread)
+
         # close handles which only the child will use
         win32file.CloseHandle(hStderrW)
@@ -235 +241 @@
 
 
+    def _raiseUnknownSignal(self, signalID):
+        """
+        Helper method raising an error when a given signal can't be handled.
+        """
+        raise ValueError(
+            "Signal not handled: %s. "
+            "Only 'INT', 'TERM' or 'KILL' can be used." % (signalID,))
+
+
     def signalProcess(self, signalID):
+        """
+        Terminate process if C{signalID} is one of "INT", "TERM", or "KILL".
+
+        @type signalID: C{str}
+        """
         if self.pid is None:
             raise error.ProcessExitedAlready()
         if signalID in ("INT", "TERM", "KILL"):
             win32process.TerminateProcess(self.hProcess, 1)
+        else:
+            self._raiseUnknownSignal(signalID)
+
+
+    def signalProcessGroup(self, signalID):
+        """
+        Terminate process group if C{signalID} is one of "INT", "TERM", or
+        "KILL".
+
+        @type signalID: C{str}
+        """
+        if self.pid is None:
+            raise error.ProcessExitedAlready()
+        if signalID in ("INT", "TERM", "KILL"):
+            win32job.TerminateJobObject(self.job, 1)
+        else:
+            self._raiseUnknownSignal(signalID)
 
 

branches/signal-process-group-2726-4/twisted/internet/interfaces.py

@@ -1506 +1506 @@
         """
 
+
     def signalProcess(signalID):
         """
@@ -1519 +1520 @@
 
         @raise twisted.internet.error.ProcessExitedAlready: The process has
-        already exited.
-        """
+            already exited.
+        """
+
+
+    def signalProcessGroup(signalID):
+        """
+        Send a signal to every processes in the process group. C{signalID}
+        takes the value as in L{signalProcess}.
+        """
+
 
 

branches/signal-process-group-2726-4/twisted/internet/process.py

@@ -332 +332 @@
         if self.pid is None:
             raise ProcessExitedAlready()
+        os.kill(self.pid, signalID)
+
+
+    def signalProcessGroup(self, signalID):
+        """
+        Send the given signal C{signalID} to the process group. It does the
+        same translation as L{signalProcess}.
+
+        @type signalID: C{str} or C{int}
+        """
+        if signalID in ('HUP', 'STOP', 'INT', 'KILL', 'TERM'):
+            signalID = getattr(signal, 'SIG%s' % (signalID,))
+        if self.pid is None:
+            raise ProcessExitedAlready()
+        self.pid = -self.pid
         os.kill(self.pid, signalID)
 

branches/signal-process-group-2726-4/twisted/test/mock_win32process.py

@@ -12 +12 @@
 import win32process
 GetExitCodeProcess = win32process.GetExitCodeProcess
+ResumeThread = win32process.ResumeThread
 STARTUPINFO = win32process.STARTUPINFO
 

branches/signal-process-group-2726-4/twisted/test/test_process.py

@@ -266 +266 @@
     """
 
-    def __init__(self, deferred, sig):
+    def __init__(self, deferred, sig, method="signalProcess"):
         self.deferred = deferred
         self.signal = sig
+        self.method = method
 
 
     def outReceived(self, data):
-        self.transport.signalProcess(self.signal)
+        getattr(self.transport, self.method)(self.signal)
 
 
@@ -1099 +1100 @@
 
 
+    def test_signalProcessGroup(self):
+        """
+        Send a INT signal to a group of processes.
+        """
+        exe = sys.executable
+        scriptPath = util.sibpath(__file__, "process_signalgroup.py")
+        d = defer.Deferred()
+        p = SignalProtocol(d, "INT", "signalProcessGroup")
+        reactor._handleSignals()
+        proc = reactor.spawnProcess(p, exe, [exe, "-u", scriptPath, "parent"],
+                                    env=None,
+                                    usePTY=self.usePTY)
+        pid = proc.pid
+        def check(result):
+            error = self.assertRaises(OSError, os.kill, -pid, 0)
+            self.assertEquals(error[0], errno.ESRCH)
+        return d.addCallback(check)
+
+
     def test_errorInProcessEnded(self):
         """
@@ -1937 +1957 @@
 
 
+
+
 class PosixProcessTestCasePTY(unittest.TestCase, PosixProcessBase):
     """
@@ -2076 +2098 @@
         """
         import win32api
-
         connected = defer.Deferred()
         ended = defer.Deferred()
@@ -2119 +2140 @@
 
         return defer.gatherResults([connected, ended])
+
+
+    def test_signalProcessGroup(self):
+        """
+        Send a INT signal to a group of processes.
+        """
+        exe = sys.executable
+        scriptPath = util.sibpath(__file__, "process_signaljob.py")
+        d = defer.Deferred()
+        p = Win32SignalProtocol(d, "INT", "signalProcessGroup")
+        reactor._handleSignals()
+        proc = reactor.spawnProcess(p, exe, [exe, "-u", scriptPath, "parent"],
+                                    env=None)
+
+        def check(result):
+            # If we're here, both processes must have terminated, so it's just
+            # a sanity check
+            import win32job
+            jobProcesses = win32job.QueryInformationJobObject(proc.job,
+                win32job.JobObjectBasicProcessIdList)
+            self.assertEquals(len(jobProcesses), 0)
+        return d.addCallback(check)