Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check process status for non-child process #39

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+137 −8
Open

check process status for non-child process #39

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
420f657
check process status for non-child process
masteret Mar 20, 2017
538430b
adopting code from psutil to determine system type
masteret May 17, 2017
c8b0f7f
add license text to 2nd part of code also
masteret May 17, 2017
dd90b08
add zombie process check for linux
masteret May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 137 additions & 8 deletions ptyprocess/ptyprocess.py
View file
Original file line number Diff line number Diff line change
@@ -699,10 +699,76 @@ def isalive(self):
except OSError as e:
# No child processes
if e.errno == errno.ECHILD:
raise PtyProcessError('isalive() encountered condition ' +
'where "terminated" is 0, but there was no child ' +
'process. Did someone else call waitpid() ' +
'on our process?')
try:
"""
The following code is adopted from psutil with slight modification

https://github.com/giampaolo/psutil/blob/master/LICENSE
psutil is distributed under BSD license reproduced below.

Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola'
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the psutil authors nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
os.kill(self.pid, 0)
if sys.platform.startswith("linux"):
with open("/proc/%s/stat" % (self.pid), "rb") as f:
data = f.read()
rpar = data.rfind(b')')
name = data[data.find(b'(') + 1:rpar]
fields_after_name = data[rpar + 2:].split()
if fields_after_name[0] == "Z":
raise PtyProcessError('isalive() encountered condition ' +
'where the child process becomes a zombie process.' +
' Does other process kill the ptyprocess?')
elif sys.platform.startswith("darwin"):
pass
elif sys.platform.startswith("freebsd"):
pass
else:
pass
"""
The adoption of psutil code ends here
"""
except OSError as err:
if err.errno == errno.ESRCH:
# No such process
raise PtyProcessError('isalive() encountered condition ' +
'where "terminated" is 0, but there was no child ' +
'process. Did someone else call waitpid() ' +
'on our process?')
elif err.errno == errno.EPERM:
# Process deny access
raise PtyProcessError('isalive() encountered condition ' +
'where the child process deny access')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe

raise PtyProcessError('isalive() does not have permission to query the process')

else:
# Other possible error
raise err
else:
# Process exists not as child
pid, status = 0, 0
else:
raise

@@ -717,10 +783,73 @@ def isalive(self):
except OSError as e: # pragma: no cover
# This should never happen...
if e.errno == errno.ECHILD:
raise PtyProcessError('isalive() encountered condition ' +
'that should never happen. There was no child ' +
'process. Did someone else call waitpid() ' +
'on our process?')
try:
"""
The following code is adopted from psutil with slight modification

https://github.com/giampaolo/psutil/blob/master/LICENSE
psutil is distributed under BSD license reproduced below.

Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola'
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the psutil authors nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
os.kill(self.pid, 0)
if sys.platform.startswith("linux"):
with open("/proc/%s/stat" % (self.pid), "rb") as f:
data = f.read()
rpar = data.rfind(b')')
name = data[data.find(b'(') + 1:rpar]
fields_after_name = data[rpar + 2:].split()
if fields_after_name[0] == "Z":
raise PtyProcessError('isalive() encountered condition ' +
'where the child process becomes a zombie process.' +
' Does other process kill the ptyprocess?')
elif sys.platform.startswith("darwin"):
pass
elif sys.platform.startswith("freebsd"):
pass
else:
pass
except OSError as err:
if err.errno == errno.ESRCH:
# No such process
raise PtyProcessError('isalive() encountered condition ' +
'where "terminated" is 0, but there was no child ' +
'process. Did someone else call waitpid() ' +
'on our process?')
elif err.errno == errno.EPERM:
# Process deny access
raise PtyProcessError('isalive() encountered condition ' +
'where the child process deny access')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe

raise PtyProcessError('isalive() does not have permission to query the process')

else:
# Other possible error
raise err
else:
# Process exists not as child
pid, status = 0, 0
else:
raise