Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
0df3d939
Commit
0df3d939
authored
17 years ago
by
msvensson@pilot.blaudden
Browse files
Options
Browse Files
Download
Plain Diff
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
parents
c2ed99e7
3393c1e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
9 deletions
+20
-9
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+20
-9
No files found.
mysql-test/lib/mtr_process.pl
View file @
0df3d939
...
...
@@ -139,19 +139,18 @@ sub spawn_impl ($$$$$$$$) {
{
if
(
$!
==
$!
{
EAGAIN
}
)
# See "perldoc Errno"
{
mtr_
debu
g
("
Got EAGAIN from fork(), sleep 1 second and redo
");
mtr_
warnin
g
("
Got EAGAIN from fork(), sleep 1 second and redo
");
sleep
(
1
);
redo
FORK
;
}
else
{
mtr_error
("
$path
(
$pid
) can't be forked
");
}
mtr_error
("
$path
(
$pid
) can't be forked, error: $!
");
}
if
(
$pid
)
{
spawn_parent_impl
(
$pid
,
$mode
,
$path
);
return
spawn_parent_impl
(
$pid
,
$mode
,
$path
);
}
else
{
...
...
@@ -216,8 +215,11 @@ sub spawn_impl ($$$$$$$$) {
{
mtr_child_error
("
failed to execute
\"
$path
\"
: $!
");
}
mtr_error
("
Should never come here 1!
");
}
mtr_error
("
Should never come here 2!
");
}
mtr_error
("
Should never come here 3!
");
}
...
...
@@ -230,12 +232,21 @@ sub spawn_parent_impl {
{
if
(
$mode
eq
'
run
'
)
{
# Simple run of command, w
e wait
for it to return
# Simple run of command, w
ait blocking
for it to return
my
$ret_pid
=
waitpid
(
$pid
,
0
);
if
(
$ret_pid
!=
$pid
)
{
mtr_error
("
waitpid(
$pid
, 0) returned
$ret_pid
"
.
"
when waiting for '
$path
'
");
# The "simple" waitpid has failed, print debug info
# and try to handle the error
mtr_warning
("
waitpid(
$pid
, 0) returned
$ret_pid
"
.
"
when waiting for '
$path
', error: '$!'
");
if
(
$ret_pid
==
-
1
)
{
# waitpid returned -1, that would indicate the process
# no longer exist and waitpid couldn't wait for it.
return
1
;
}
mtr_error
("
Error handling failed
");
}
return
mtr_process_exit_status
(
$?
);
...
...
This diff is collapsed.
Click to expand it.
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