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
a3d74c0f
Commit
a3d74c0f
authored
Jan 18, 2011
by
alina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Igonring interrupted system call in _read_reply
parent
6d20dfda
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
12 deletions
+10
-12
src/netns/protocol.py
src/netns/protocol.py
+10
-12
No files found.
src/netns/protocol.py
View file @
a3d74c0f
...
...
@@ -100,12 +100,8 @@ class Server(object):
while
time
.
time
()
-
now
<
KILL_WAIT
:
ch
=
[]
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
netns
.
subprocess_
.
poll
(
pid
):
ch
.
append
(
pid
)
if
not
ch
:
break
time
.
sleep
(
0.1
)
...
...
@@ -113,11 +109,7 @@ class Server(object):
warning
(
"Killing forcefully process %d."
%
pid
)
os
.
kill
(
pid
,
signal
.
SIGKILL
)
for
pid
in
ch
:
try
:
netns
.
subprocess_
.
poll
(
pid
)
except
OSError
,
e
:
if
e
.
errno
!=
errno
.
ECHILD
:
raise
e
netns
.
subprocess_
.
poll
(
pid
)
for
f
in
self
.
_xauthfiles
.
values
():
try
:
...
...
@@ -545,7 +537,13 @@ class Client(object):
raise
RuntimeError
(
"Client already shut down."
)
text
=
[]
while
True
:
line
=
self
.
_rfd
.
readline
().
rstrip
()
try
:
line
=
self
.
_rfd
.
readline
().
rstrip
()
except
IOError
,
e
:
if
e
.
errno
==
errno
.
EINTR
:
continue
else
:
raise
e
if
not
line
:
raise
RuntimeError
(
"Protocol error, empty line received"
)
...
...
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