X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=780371b9945b396514ffeac40b0678ebca946a33;hp=daec62d2af09055409677d90885bc9faac5ce4af;hb=f98070844c2d468fdbb6beb5b65e4ccbbcd3f10b;hpb=dddff2e7c658aa84f67186ade0a4845b5fb0b43f
diff --git a/main.cpp b/main.cpp
index daec62d2..780371b9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,28 +14,45 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifdef ENABLE_DECODE
#include /* First, so we avoid a _POSIX_C_SOURCE warning. */
#endif
-#include
-#include
-
+#include
+#include
#include
+#include
+
+#include
+#include
#include
+#include
+#include
+#include
+#include
+#include
#ifdef ENABLE_SIGNALS
#include "signalhandler.hpp"
#endif
+#ifdef ENABLE_STACKTRACE
+#include
+#include
+#include
+#endif
+
#include "pv/application.hpp"
#include "pv/devicemanager.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/logging.hpp"
#include "pv/mainwindow.hpp"
+#include "pv/session.hpp"
+
#ifdef ANDROID
#include
#include "android/assetreader.hpp"
@@ -45,16 +62,87 @@
#include "config.h"
#ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
#include
-Q_IMPORT_PLUGIN(qsvg)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QSvgPlugin)
+#endif
+
+using std::exception;
+using std::ifstream;
+using std::ofstream;
+using std::shared_ptr;
+using std::string;
+
+#if ENABLE_STACKTRACE
+QString stacktrace_filename;
+
+void signal_handler(int signum)
+{
+ ::signal(signum, SIG_DFL);
+ 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()
{
fprintf(stdout,
"Usage:\n"
- " %s [OPTIONâ¦] â %s\n"
+ " %s [OPTIONS] [FILE]\n"
"\n"
"Help Options:\n"
" -h, -?, --help Show help option\n"
@@ -62,16 +150,24 @@ void usage()
"Application Options:\n"
" -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"
" -i, --input-file Load input from file\n"
" -I, --input-format Input format\n"
- "\n", PV_BIN_NAME, PV_DESCRIPTION);
+ " -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 main(int argc, char *argv[])
{
int ret = 0;
- std::shared_ptr context;
- std::string open_file, open_file_format;
+ shared_ptr context;
+ string open_file_format, driver;
+ vector open_files;
+ bool restore_sessions = true;
+ bool do_scan = true;
+ bool do_logging = true;
Application a(argc, argv);
@@ -82,18 +178,22 @@ int main(int argc, char *argv[])
#endif
// Parse arguments
- while (1) {
+ while (true) {
static const struct option long_options[] = {
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'V'},
- {"loglevel", required_argument, 0, 'l'},
- {"input-file", required_argument, 0, 'i'},
- {"input-format", required_argument, 0, 'I'},
- {0, 0, 0, 0}
+ {"help", no_argument, nullptr, 'h'},
+ {"version", no_argument, nullptr, 'V'},
+ {"loglevel", required_argument, nullptr, 'l'},
+ {"driver", required_argument, nullptr, 'd'},
+ {"no-scan", no_argument, nullptr, 'D'},
+ {"input-file", required_argument, nullptr, 'i'},
+ {"input-format", required_argument, nullptr, 'I'},
+ {"clean", no_argument, nullptr, 'c'},
+ {"log-to-stdout", no_argument, nullptr, 's'},
+ {nullptr, 0, nullptr, 0}
};
const int c = getopt_long(argc, argv,
- "l:Vh?i:I:", long_options, nullptr);
+ "h?VDcsl:d:i:I:", long_options, nullptr);
if (c == -1)
break;
@@ -111,34 +211,79 @@ int main(int argc, char *argv[])
case 'l':
{
const int loglevel = atoi(optarg);
+ if (loglevel < 0 || loglevel > 5) {
+ qDebug() << "ERROR: invalid log level spec.";
+ break;
+ }
context->set_log_level(sigrok::LogLevel::get(loglevel));
#ifdef ENABLE_DECODE
srd_log_loglevel_set(loglevel);
#endif
+ if (loglevel >= 5) {
+ const QSettings settings;
+ qDebug() << "Settings:" << settings.fileName()
+ << "format" << settings.format();
+ }
break;
}
+ case 'd':
+ driver = optarg;
+ break;
+
+ case 'D':
+ do_scan = false;
+ break;
+
case 'i':
- open_file = optarg;
+ open_files.push_back(optarg);
break;
case 'I':
open_file_format = optarg;
break;
+
+ 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 openened.\n");
- return 1;
- } else 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();
// Initialise libsigrok
context = sigrok::Context::create();
+ pv::Session::sr_context = context;
+
+#if ENABLE_STACKTRACE
+ QString temp_path = QStandardPaths::standardLocations(
+ QStandardPaths::TempLocation).at(0);
+ stacktrace_filename = temp_path + "/pv_stacktrace.dmp";
+ qDebug() << "Stack trace file is" << stacktrace_filename;
+
+ ::signal(SIGSEGV, &signal_handler);
+ ::signal(SIGABRT, &signal_handler);
+
+ if (QFileInfo::exists(stacktrace_filename))
+ process_stacktrace(temp_path);
+#endif
+
#ifdef ANDROID
context->set_resource_reader(&asset_reader);
#endif
@@ -155,44 +300,52 @@ int main(int argc, char *argv[])
srd_decoder_load_all();
#endif
+#ifndef ENABLE_STACKTRACE
try {
- // Create the device manager, initialise the drivers
- pv::DeviceManager device_manager(context);
+#endif
- // Initialise the main window
- pv::MainWindow w(device_manager,
- open_file, open_file_format);
- w.show();
+ // 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();
+
+ if (restore_sessions)
+ w.restore_sessions();
+
+ 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()) {
- 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();
- } catch(std::exception e) {
- qDebug() << e.what();
+#ifndef ENABLE_STACKTRACE
+ } catch (exception& e) {
+ qDebug() << "Exception:" << e.what();
}
+#endif
#ifdef ENABLE_DECODE
// Destroy libsigrokdecode
srd_exit();
#endif
- } while (0);
+ } while (false);
return ret;
}