Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
451531e9
Commit
451531e9
authored
Jan 24, 2019
by
Stéphane Del Pino
Browse files
Options
Downloads
Patches
Plain Diff
Fix pause on error in parallel
deactivate "auto pause" mode (should try to fix it since it would be quite handy)
parent
260fb78d
No related branches found
No related tags found
1 merge request
!11
Feature/mpi
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/utils/SignalManager.cpp
+26
-25
26 additions, 25 deletions
src/utils/SignalManager.cpp
with
26 additions
and
25 deletions
src/utils/SignalManager.cpp
+
26
−
25
View file @
451531e9
...
@@ -12,6 +12,8 @@
...
@@ -12,6 +12,8 @@
#include
<pastis_config.hpp>
#include
<pastis_config.hpp>
#include
<rang.hpp>
#include
<rang.hpp>
#include
<Messenger.hpp>
std
::
string
SignalManager
::
s_pause_on_error
=
"auto"
;
std
::
string
SignalManager
::
s_pause_on_error
=
"auto"
;
void
SignalManager
::
setPauseForDebug
(
const
std
::
string
&
pause_on_error
)
void
SignalManager
::
setPauseForDebug
(
const
std
::
string
&
pause_on_error
)
{
{
...
@@ -34,24 +36,23 @@ std::string SignalManager::signalName(const int& signal)
...
@@ -34,24 +36,23 @@ std::string SignalManager::signalName(const int& signal)
void
SignalManager
::
pauseForDebug
(
const
int
&
signal
)
void
SignalManager
::
pauseForDebug
(
const
int
&
signal
)
{
{
if
(
std
::
string
(
PASTIS_BUILD_TYPE
)
!=
"Release"
)
{
if
(
std
::
string
(
PASTIS_BUILD_TYPE
)
!=
"Release"
)
{
if
((
ConsoleManager
::
isTerminal
(
pout
())
and
#warning should try to detect if outputs to a terminal (buggy with mpi)
(
s_pause_on_error
==
"auto"
))
or
if
(
// (ConsoleManager::isTerminal(pout()) and
(s_pause_on_error == "auto")) or
(
s_pause_on_error
==
"yes"
))
{
(
s_pause_on_error
==
"yes"
))
{
pout
()
<<
"
\n
======================================
\n
"
;
std
::
cerr
<<
"
\n
======================================
\n
"
pout
()
<<
rang
::
style
::
reset
<<
rang
::
style
::
reset
<<
rang
::
fg
::
reset
<<
rang
::
fg
::
reset
<<
rang
::
style
::
bold
;
<<
rang
::
style
::
bold
pout
()
<<
"to attach gdb to this process run
\n
"
;
<<
"to attach gdb to this process run
\n
"
pout
()
<<
"
\t
gdb -pid "
<<
"
\t
gdb -pid "
<<
rang
::
fg
::
red
<<
rang
::
fg
::
red
<<
getpid
()
<<
getpid
()
<<
rang
::
fg
::
reset
<<
rang
::
fg
::
reset
<<
'\n'
;
<<
'\n'
pout
()
<<
"else press Control-C to exit
\n
"
;
<<
"else press Control-C to exit
\n
"
pout
()
<<
rang
::
style
::
reset
;
<<
rang
::
style
::
reset
pout
()
<<
"======================================
\n
"
;
<<
"======================================
\n
"
pout
()
<<
std
::
flush
;
<<
std
::
flush
;
pause
();
pause
();
}
}
}
}
...
@@ -66,6 +67,9 @@ void SignalManager::handler(int signal)
...
@@ -66,6 +67,9 @@ void SignalManager::handler(int signal)
std
::
signal
(
SIGINT
,
SIG_DFL
);
std
::
signal
(
SIGINT
,
SIG_DFL
);
std
::
signal
(
SIGABRT
,
SIG_DFL
);
std
::
signal
(
SIGABRT
,
SIG_DFL
);
BacktraceManager
bm
;
std
::
cerr
<<
bm
<<
'\n'
;
std
::
exception_ptr
eptr
=
std
::
current_exception
();
std
::
exception_ptr
eptr
=
std
::
current_exception
();
try
{
try
{
if
(
eptr
)
{
if
(
eptr
)
{
...
@@ -73,17 +77,17 @@ void SignalManager::handler(int signal)
...
@@ -73,17 +77,17 @@ void SignalManager::handler(int signal)
}
}
}
}
catch
(
const
AssertError
&
assert_error
)
{
catch
(
const
AssertError
&
assert_error
)
{
p
err
()
<<
assert_error
<<
'\n'
;
std
::
c
err
<<
assert_error
<<
'\n'
;
}
}
catch
(...)
{
catch
(...)
{
p
err
()
<<
"Unknown exception!
\n
"
;
std
::
c
err
<<
"Unknown exception!
\n
"
;
}
}
p
err
()
<<
"
\n
*** "
std
::
c
err
<<
"
\n
*** "
<<
rang
::
style
::
reset
<<
rang
::
style
::
reset
<<
rang
::
fg
::
reset
<<
rang
::
fg
::
reset
<<
rang
::
style
::
bold
;
<<
rang
::
style
::
bold
perr
()
<<
"Signal "
<<
"Signal "
<<
rang
::
fgB
::
red
<<
rang
::
fgB
::
red
<<
signalName
(
signal
)
<<
signalName
(
signal
)
<<
rang
::
fg
::
reset
<<
rang
::
fg
::
reset
...
@@ -91,9 +95,6 @@ void SignalManager::handler(int signal)
...
@@ -91,9 +95,6 @@ void SignalManager::handler(int signal)
<<
rang
::
style
::
reset
<<
rang
::
style
::
reset
<<
" ***
\n
"
;
<<
" ***
\n
"
;
BacktraceManager
bm
;
perr
()
<<
bm
<<
'\n'
;
SignalManager
::
pauseForDebug
(
signal
);
SignalManager
::
pauseForDebug
(
signal
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment