X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=main.cpp;h=d2512331157f4e23ac51d50ee725b9708716b35d;hb=d0f22e70fac3829be356143b4f2b6693f162f682;hp=0f9aec2f7adc6316a1dd05d26b3417b12df454df;hpb=ed6f8680ba30649409b35ffccb7f815cb7b1a23a;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index 0f9aec2..d2512331 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,10 +33,19 @@
 #include "signalhandler.hpp"
 #endif
 
+#ifdef ENABLE_STACKTRACE
+#include <signal.h>
+#include <boost/stacktrace.hpp>
+#include <QStandardPaths>
+#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 <libsigrokandroidutils/libsigrokandroidutils.h>
 #include "android/assetreader.hpp"
@@ -55,6 +64,17 @@ using std::exception;
 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);
+}
+#endif
+
 void usage()
 {
 	fprintf(stdout,
@@ -68,9 +88,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"
 		"  -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);
 }
 
@@ -80,6 +102,8 @@ int main(int argc, char *argv[])
 	shared_ptr<sigrok::Context> context;
 	string open_file, open_file_format, driver;
 	bool restore_sessions = true;
+	bool do_scan = true;
+	bool do_logging = true;
 
 	Application a(argc, argv);
 
@@ -96,14 +120,16 @@ 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'},
 			{"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:Vhc?d:i:I:", long_options, nullptr);
+			"h?VDcsl:d:i:I:", long_options, nullptr);
 		if (c == -1)
 			break;
 
@@ -143,6 +169,10 @@ int main(int argc, char *argv[])
 			driver = optarg;
 			break;
 
+		case 'D':
+			do_scan = false;
+			break;
+
 		case 'i':
 			open_file = optarg;
 			break;
@@ -154,6 +184,10 @@ int main(int argc, char *argv[])
 		case 'c':
 			restore_sessions = false;
 			break;
+
+		case 's':
+			do_logging = false;
+			break;
 		}
 	}
 
@@ -165,10 +199,27 @@ int main(int argc, char *argv[])
 	if (argc - optind == 1)
 		open_file = argv[argc - 1];
 
+	// 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);
+#endif
+
 #ifdef ANDROID
 	context->set_resource_reader(&asset_reader);
 #endif
@@ -185,44 +236,44 @@ 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, driver);
+#endif
+
+		// 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();
+		// 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_file.empty())
+			w.add_session_with_file(open_file, open_file_format);
+		else
+			w.add_default_session();
 
 #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 (exception e) {
-			qDebug() << e.what();
+#ifndef ENABLE_STACKTRACE
+		} catch (exception& e) {
+			qDebug() << "Exception:" << e.what();
 		}
+#endif
 
 #ifdef ENABLE_DECODE
 		// Destroy libsigrokdecode