X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=4bbddcc644bdf4c5bbb7ebf6398ed8e58da75b16;hp=d2512331157f4e23ac51d50ee725b9708716b35d;hb=5322d2d051e051cb44fe60fc4375b6ffc1ea8c01;hpb=d0f22e70fac3829be356143b4f2b6693f162f682 diff --git a/main.cpp b/main.cpp index d2512331..4bbddcc6 100644 --- a/main.cpp +++ b/main.cpp @@ -22,12 +22,26 @@ #endif #include -#include - +#include #include +#include + +#ifdef ENABLE_FLOW +#include +#include +#endif + +#include +#include #include +#include +#include +#include #include +#include + +#include "config.h" #ifdef ENABLE_SIGNALS #include "signalhandler.hpp" @@ -45,6 +59,7 @@ #include "pv/logging.hpp" #include "pv/mainwindow.hpp" #include "pv/session.hpp" +#include "pv/util.hpp" #ifdef ANDROID #include @@ -52,8 +67,6 @@ #include "android/loghandler.hpp" #endif -#include "config.h" - #ifdef _WIN32 #include Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) @@ -61,6 +74,8 @@ Q_IMPORT_PLUGIN(QSvgPlugin) #endif using std::exception; +using std::ifstream; +using std::ofstream; using std::shared_ptr; using std::string; @@ -73,6 +88,60 @@ void signal_handler(int signum) boost::stacktrace::safe_dump_to(stacktrace_filename.toLocal8Bit().data()); ::raise(SIGABRT); } + +void process_stacktrace(QString temp_path) +{ + const QString stacktrace_outfile = temp_path + "/pv_stacktrace.txt"; + + ifstream ifs(stacktrace_filename.toLocal8Bit().data()); + ofstream ofs(stacktrace_outfile.toLocal8Bit().data(), + ofstream::out | ofstream::trunc); + + boost::stacktrace::stacktrace st = + boost::stacktrace::stacktrace::from_dump(ifs); + ofs << st; + + ofs.close(); + ifs.close(); + + QFile f(stacktrace_outfile); + f.open(QFile::ReadOnly | QFile::Text); + QTextStream fs(&f); + QString stacktrace = fs.readAll(); + stacktrace = stacktrace.trimmed().replace('\n', "
"); + + qDebug() << QObject::tr("Stack trace of previous crash:"); + qDebug() << "---------------------------------------------------------"; + // Note: qDebug() prints quotation marks for QString output, so we feed it char* + qDebug() << stacktrace.toLocal8Bit().data(); + qDebug() << "---------------------------------------------------------"; + + f.close(); + + // Remove stack trace so we don't process it again the next time we run + QFile::remove(stacktrace_filename.toLocal8Bit().data()); + + // Show notification dialog if permitted + pv::GlobalSettings settings; + if (settings.value(pv::GlobalSettings::Key_Log_NotifyOfStacktrace).toBool()) { + QCheckBox *cb = new QCheckBox(QObject::tr("Don't show this message again")); + + QMessageBox msgbox; + msgbox.setText(QObject::tr("When %1 last crashed, it created a stack trace.\n" \ + "A human-readable form has been saved to disk and was written to " \ + "the log. You may access it from the settings dialog.").arg(PV_TITLE)); + msgbox.setIcon(QMessageBox::Icon::Information); + msgbox.addButton(QMessageBox::Ok); + msgbox.setCheckBox(cb); + + QObject::connect(cb, &QCheckBox::stateChanged, [](int state){ + pv::GlobalSettings settings; + settings.setValue(pv::GlobalSettings::Key_Log_NotifyOfStacktrace, + !state); }); + + msgbox.exec(); + } +} #endif void usage() @@ -88,11 +157,11 @@ void usage() " -V, --version Show release version\n" " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n" " -d, --driver Specify the device driver to use\n" - " -D, --no-scan Don't auto-scan for devices, use -d spec only\n" + " -D, --dont-scan Don't auto-scan for devices, use -d spec only\n" " -i, --input-file Load input from file\n" + " -s, --settings Load PulseView session setup from file\n" " -I, --input-format Input format\n" " -c, --clean Don't restore previous sessions on startup\n" - " -s, --log-to-stdout Don't use logging, output to stdout instead\n" "\n", PV_BIN_NAME); } @@ -100,10 +169,19 @@ int main(int argc, char *argv[]) { int ret = 0; shared_ptr context; - string open_file, open_file_format, driver; + string open_file_format, open_setup_file, driver; + vector open_files; bool restore_sessions = true; bool do_scan = true; - bool do_logging = true; + bool show_version = false; + +#ifdef ENABLE_FLOW + // Initialise gstreamermm. Must be called before any other GLib stuff. + Gst::init(); + + // Initialize libsigrokflow. Must be called after Gst::init(). + Srf::init(); +#endif Application a(argc, argv); @@ -120,8 +198,9 @@ int main(int argc, char *argv[]) {"version", no_argument, nullptr, 'V'}, {"loglevel", required_argument, nullptr, 'l'}, {"driver", required_argument, nullptr, 'd'}, - {"no-scan", no_argument, nullptr, 'D'}, + {"dont-scan", no_argument, nullptr, 'D'}, {"input-file", required_argument, nullptr, 'i'}, + {"settings", required_argument, nullptr, 's'}, {"input-format", required_argument, nullptr, 'I'}, {"clean", no_argument, nullptr, 'c'}, {"log-to-stdout", no_argument, nullptr, 's'}, @@ -129,7 +208,7 @@ int main(int argc, char *argv[]) }; const int c = getopt_long(argc, argv, - "h?VDcsl:d:i:I:", long_options, nullptr); + "h?VDcl:d:i:s:I:", long_options, nullptr); if (c == -1) break; @@ -140,9 +219,8 @@ int main(int argc, char *argv[]) return 0; case 'V': - // Print version info - fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING); - return 0; + show_version = true; + break; case 'l': { @@ -174,7 +252,11 @@ int main(int argc, char *argv[]) break; case 'i': - open_file = optarg; + open_files.emplace_back(optarg); + break; + + case 's': + open_setup_file = optarg; break; case 'I': @@ -184,27 +266,24 @@ int main(int argc, char *argv[]) case 'c': restore_sessions = false; break; - - case 's': - do_logging = false; - break; } } + argc -= optind; + argv += optind; - if (argc - optind > 1) { - fprintf(stderr, "Only one file can be opened.\n"); - return 1; - } + for (int i = 0; i < argc; i++) + open_files.emplace_back(argv[i]); - if (argc - optind == 1) - open_file = argv[argc - 1]; + qRegisterMetaType("util::Timestamp"); + qRegisterMetaType("uint64_t"); // Prepare the global settings since logging needs them early on pv::GlobalSettings settings; + settings.save_internal_defaults(); settings.set_defaults_where_needed(); + settings.apply_theme(); - if (do_logging) - pv::logging.init(); + pv::logging.init(); // Initialise libsigrok context = sigrok::Context::create(); @@ -218,6 +297,9 @@ int main(int argc, char *argv[]) ::signal(SIGSEGV, &signal_handler); ::signal(SIGABRT, &signal_handler); + + if (QFileInfo::exists(stacktrace_filename)) + process_stacktrace(temp_path); #endif #ifdef ANDROID @@ -243,31 +325,37 @@ int main(int argc, char *argv[]) // Create the device manager, initialise the drivers pv::DeviceManager device_manager(context, driver, do_scan); - // Initialise the main window - pv::MainWindow w(device_manager); - w.show(); + a.collect_version_info(context); + if (show_version) { + a.print_version_info(); + } else { + // Initialise the main window + pv::MainWindow w(device_manager); + w.show(); - if (restore_sessions) - w.restore_sessions(); + if (restore_sessions) + w.restore_sessions(); - if (!open_file.empty()) - w.add_session_with_file(open_file, open_file_format); - else - w.add_default_session(); + if (open_files.empty()) + w.add_default_session(); + else + for (string& open_file : open_files) + w.add_session_with_file(open_file, open_file_format, open_setup_file); #ifdef ENABLE_SIGNALS - if (SignalHandler::prepare_signals()) { - SignalHandler *const handler = new SignalHandler(&w); - QObject::connect(handler, SIGNAL(int_received()), - &w, SLOT(close())); - QObject::connect(handler, SIGNAL(term_received()), - &w, SLOT(close())); - } else - qWarning() << "Could not prepare signal handler."; + if (SignalHandler::prepare_signals()) { + SignalHandler *const handler = new SignalHandler(&w); + QObject::connect(handler, SIGNAL(int_received()), + &w, SLOT(close())); + QObject::connect(handler, SIGNAL(term_received()), + &w, SLOT(close())); + } else + qWarning() << "Could not prepare signal handler."; #endif - // Run the application - ret = a.exec(); + // Run the application + ret = a.exec(); + } #ifndef ENABLE_STACKTRACE } catch (exception& e) {