#endif
#include <cstdint>
-#include <libsigrokcxx/libsigrokcxx.hpp>
-
+#include <fstream>
#include <getopt.h>
+#include <vector>
+
+#include <libsigrokcxx/libsigrokcxx.hpp>
+#include <QCheckBox>
#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QMessageBox>
#include <QSettings>
+#include <QTextStream>
#ifdef ENABLE_SIGNALS
#include "signalhandler.hpp"
#endif
using std::exception;
+using std::ifstream;
+using std::ofstream;
using std::shared_ptr;
using std::string;
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', "<br />");
+
+ 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()
" -i, --input-file Load input 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);
}
{
int ret = 0;
shared_ptr<sigrok::Context> context;
- string open_file, open_file_format, driver;
+ string open_file_format, driver;
+ vector<string> open_files;
bool restore_sessions = true;
bool do_scan = true;
- bool do_logging = true;
Application a(argc, argv);
};
const int c = getopt_long(argc, argv,
- "h?VDcsl:d:i:I:", long_options, nullptr);
+ "h?VDcl:d:i:I:", long_options, nullptr);
if (c == -1)
break;
break;
case 'i':
- open_file = optarg;
+ open_files.push_back(optarg);
break;
case 'I':
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;
- }
-
- if (argc - optind == 1)
- open_file = argv[argc - 1];
+ for (int i = 0; i < argc; i++)
+ open_files.push_back(argv[i]);
// Prepare the global settings since logging needs them early on
pv::GlobalSettings settings;
settings.set_defaults_where_needed();
- if (do_logging)
- pv::logging.init();
+ pv::logging.init();
// Initialise libsigrok
context = sigrok::Context::create();
::signal(SIGSEGV, &signal_handler);
::signal(SIGABRT, &signal_handler);
+
+ if (QFileInfo::exists(stacktrace_filename))
+ process_stacktrace(temp_path);
#endif
#ifdef ANDROID
if (restore_sessions)
w.restore_sessions();
- if (!open_file.empty())
- w.add_session_with_file(open_file, open_file_format);
- else
+ 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);
#ifdef ENABLE_SIGNALS
if (SignalHandler::prepare_signals()) {