Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nemu3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
nemu3
Commits
6d20dfda
Commit
6d20dfda
authored
Jan 11, 2011
by
alina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix: in protocol.clean() waitpid was being call for defunc pids also.
parent
84a3f136
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
src/netns/protocol.py
src/netns/protocol.py
+14
-4
No files found.
src/netns/protocol.py
View file @
6d20dfda
...
@@ -98,16 +98,26 @@ class Server(object):
...
@@ -98,16 +98,26 @@ class Server(object):
os
.
kill
(
pid
,
signal
.
SIGTERM
)
os
.
kill
(
pid
,
signal
.
SIGTERM
)
now
=
time
.
time
()
now
=
time
.
time
()
while
time
.
time
()
-
now
<
KILL_WAIT
:
while
time
.
time
()
-
now
<
KILL_WAIT
:
ch
=
[
pid
for
pid
in
self
.
_children
ch
=
[]
if
not
netns
.
subprocess_
.
poll
(
pid
)]
for
pid
in
self
.
_children
:
try
:
if
not
netns
.
subprocess_
.
poll
(
pid
):
ch
.
append
(
pid
)
except
OSError
,
e
:
if
e
.
errno
!=
errno
.
ECHILD
:
raise
e
if
not
ch
:
if
not
ch
:
break
break
time
.
sleep
(
0.1
)
time
.
sleep
(
0.1
)
for
pid
in
ch
:
for
pid
in
ch
:
warning
(
"Killing forcefully process %d."
%
pid
)
warning
(
"Killing forcefully process %d."
%
pid
)
os
.
kill
(
pid
,
signal
.
SIGKILL
)
os
.
kill
(
pid
,
signal
.
SIGKILL
)
for
pid
in
self
.
_children
:
for
pid
in
ch
:
netns
.
subprocess_
.
poll
(
pid
)
try
:
netns
.
subprocess_
.
poll
(
pid
)
except
OSError
,
e
:
if
e
.
errno
!=
errno
.
ECHILD
:
raise
e
for
f
in
self
.
_xauthfiles
.
values
():
for
f
in
self
.
_xauthfiles
.
values
():
try
:
try
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment