seldrive: use common sig handler (#28127)

* Update main.cc

* Update util.h

* same for navd
old-commit-hash: e780cca8b6
beeps
Shane Smiskol 2 years ago committed by GitHub
parent 8cb0a252ae
commit 3af7b02a26
  1. 14
      selfdrive/navd/main.cc
  2. 1
      selfdrive/ui/qt/util.h
  3. 8
      selfdrive/ui/soundd/main.cc

@ -7,22 +7,12 @@
#include "selfdrive/navd/map_renderer.h" #include "selfdrive/navd/map_renderer.h"
#include "system/hardware/hw.h" #include "system/hardware/hw.h"
void sigHandler(int s) {
qInfo() << "Shutting down";
std::signal(s, SIG_DFL);
qApp->quit();
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
qInstallMessageHandler(swagLogMessageHandler); qInstallMessageHandler(swagLogMessageHandler);
QApplication app(argc, argv); QApplication app(argc, argv);
std::signal(SIGINT, sigHandler); std::signal(SIGINT, sigTermHandler);
std::signal(SIGTERM, sigHandler); std::signal(SIGTERM, sigTermHandler);
MapRenderer * m = new MapRenderer(get_mapbox_settings()); MapRenderer * m = new MapRenderer(get_mapbox_settings());
assert(m); assert(m);

@ -17,6 +17,7 @@ QMap<QString, QString> getSupportedLanguages();
void configFont(QPainter &p, const QString &family, int size, const QString &style); void configFont(QPainter &p, const QString &family, int size, const QString &style);
void clearLayout(QLayout* layout); void clearLayout(QLayout* layout);
void setQtSurfaceFormat(); void setQtSurfaceFormat();
void sigTermHandler(int s);
QString timeAgo(const QDateTime &date); QString timeAgo(const QDateTime &date);
void swagLogMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg); void swagLogMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
void initApp(int argc, char *argv[], bool disable_hidpi = true); void initApp(int argc, char *argv[], bool disable_hidpi = true);

@ -5,17 +5,13 @@
#include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/util.h"
#include "selfdrive/ui/soundd/sound.h" #include "selfdrive/ui/soundd/sound.h"
void sigHandler(int s) {
qApp->quit();
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
qInstallMessageHandler(swagLogMessageHandler); qInstallMessageHandler(swagLogMessageHandler);
setpriority(PRIO_PROCESS, 0, -20); setpriority(PRIO_PROCESS, 0, -20);
QApplication a(argc, argv); QApplication a(argc, argv);
std::signal(SIGINT, sigHandler); std::signal(SIGINT, sigTermHandler);
std::signal(SIGTERM, sigHandler); std::signal(SIGTERM, sigTermHandler);
Sound sound; Sound sound;
return a.exec(); return a.exec();

Loading…
Cancel
Save