OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

move resetTerminal functions from start.hh to terminal.cpp

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-09-05 11:07:18 +02:00
parent 909aa53efc
commit 2492c0867d
3 changed files with 78 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
opm/models/utils/start.hh
View File

@ -54,13 +54,10 @@
#include <iostream>
#include <sstream>
#include <string>
#include <locale>
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <signal.h>
#include <string.h>
#if HAVE_MPI
#include <mpi.h>
@ -202,65 +199,6 @@ static inline int setupParameters_(int argc,
return /*status=*/0;
}
/*!
* \brief Resets the current TTY to a usable state if the program was aborted.
*
* This is intended to be called as part of a generic exception handler
*/
static inline void resetTerminal_()
{
// make sure stderr and stderr do not contain any unwritten data and make sure that
// the TTY does not see any unfinished ANSI escape sequence.
std::cerr << " \r\n";
std::cerr.flush();
std::cout << " \r\n";
std::cout.flush();
// it seems like some terminals sometimes takes their time to react, so let's
// accommodate them.
usleep(/*usec=*/500*1000);
// this requires the 'stty' command to be available in the command search path. on
// most linux systems, is the case. (but even if the system() function fails, the
// worst thing which can happen is that the TTY stays potentially choked up...)
if (system("stty sane") != 0)
std::cout << "Executing the 'stty' command failed."
<< " Terminal might be left in an undefined state!\n";
}
/*!
* \brief Resets the current TTY to a usable state if the program was interrupted by
* SIGABRT or SIGINT.
*/
static inline void resetTerminal_(int signum)
{
// first thing to do when a nuke hits: restore the default signal handler
signal(signum, SIG_DFL);
#if HAVE_MPI
int rank = 0;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
if (rank != 0) {
// re-raise the signal
raise(signum);
return;
}
#endif
if (isatty(fileno(stdout)) && isatty(fileno(stdin))) {
std::cout << "\n\nReceived signal " << signum
<< " (\"" << strsignal(signum) << "\")."
<< " Trying to reset the terminal.\n";
resetTerminal_();
}
// after we did our best to clean the pedestrian way, re-raise the signal
raise(signum);
}
//! \endcond
/*!
* \ingroup Common
*
@ -283,13 +221,13 @@ static inline int start(int argc, char **argv, bool registerParams=true)
// set the signal handlers to reset the TTY to a well defined state on unexpected
// program aborts
if (isatty(STDIN_FILENO)) {
signal(SIGINT, resetTerminal_);
signal(SIGHUP, resetTerminal_);
signal(SIGABRT, resetTerminal_);
signal(SIGFPE, resetTerminal_);
signal(SIGSEGV, resetTerminal_);
signal(SIGPIPE, resetTerminal_);
signal(SIGTERM, resetTerminal_);
signal(SIGINT, resetTerminal);
signal(SIGHUP, resetTerminal);
signal(SIGABRT, resetTerminal);
signal(SIGFPE, resetTerminal);
signal(SIGSEGV, resetTerminal);
signal(SIGPIPE, resetTerminal);
signal(SIGTERM, resetTerminal);
}
resetLocale();
@ -392,7 +330,7 @@ static inline int start(int argc, char **argv, bool registerParams=true)
std::cout << e.what() << ". Abort!\n" << std::flush;
std::cout << "Trying to reset TTY.\n";
resetTerminal_();
resetTerminal();
}
return 1;
@ -403,7 +341,7 @@ static inline int start(int argc, char **argv, bool registerParams=true)
std::cout << "Unknown exception thrown!\n" << std::flush;
std::cout << "Trying to reset TTY.\n";
resetTerminal_();
resetTerminal();
}
return 3;

56
opm/models/utils/terminal.cpp
View File

@ -24,6 +24,12 @@
#include <config.h>
#include <opm/models/utils/terminal.hpp>
#if HAVE_MPI
#include <mpi.h>
#endif
#include <csignal>
#include <iostream>
#include <sys/ioctl.h>
#include <unistd.h>
@ -98,4 +104,54 @@ int getTtyWidth()
return ttyWidth;
}
void resetTerminal()
{
// make sure stderr and stderr do not contain any unwritten data and make sure that
// the TTY does not see any unfinished ANSI escape sequence.
std::cerr << " \r\n";
std::cerr.flush();
std::cout << " \r\n";
std::cout.flush();
// it seems like some terminals sometimes takes their time to react, so let's
// accommodate them.
usleep(/*usec=*/500*1000);
// this requires the 'stty' command to be available in the command search path. on
// most linux systems, is the case. (but even if the system() function fails, the
// worst thing which can happen is that the TTY stays potentially choked up...)
if (system("stty sane") != 0) {
std::cout << "Executing the 'stty' command failed."
<< " Terminal might be left in an undefined state!\n";
}
}
void resetTerminal(int signum)
{
// first thing to do when a nuke hits: restore the default signal handler
signal(signum, SIG_DFL);
#if HAVE_MPI
int rank = 0;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
if (rank != 0) {
// re-raise the signal
raise(signum);
return;
}
#endif
if (isatty(fileno(stdout)) && isatty(fileno(stdin))) {
std::cout << "\n\nReceived signal " << signum
<< " (\"" << strsignal(signum) << "\")."
<< " Trying to reset the terminal.\n";
resetTerminal();
}
// after we did our best to clean the pedestrian way, re-raise the signal
raise(signum);
}
} // namespace Opm

13
opm/models/utils/terminal.hpp
View File

@ -44,6 +44,19 @@ std::string breakLines(const std::string& msg,
*/
int getTtyWidth();
/*!
* \brief Resets the current TTY to a usable state if the program was aborted.
*
* This is intended to be called as part of a generic exception handler
*/
void resetTerminal();
/*!
* \brief Resets the current TTY to a usable state if the program was interrupted by
* SIGABRT or SIGINT.
*/
void resetTerminal(int signum);
} // namespace Opm
#endif // OPM_TERMINAL_HPP