Added loglevel command line option

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index ba6d66452c7a6f1a5f2330e6e53f286c473c8c1e..fef53247deb71820a424050f899f31f7a297f350 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,11 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
-}
 
 #include <getopt.h>
 
@@ -33,24 +32,47 @@ extern "C" {
 
 #include "config.h"
 
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
 void usage()
 {
-       fprintf(stderr,
+       fprintf(stdout,
                "Usage:\n"
-               "  %s — %s\n"
+               "  %s [OPTION…] [FILE] — %s\n"
                "\n"
                "Help Options:\n"
+               "  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
                "  -V, --version                   Show release version\n"
                "  -h, -?, --help                  Show help option\n"
                "\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
+/*
+ * SIGINT handler (likely received Ctrl-C from terminal)
+ */
+void sigint_handler(int param)
+{
+       (void)param;
+
+       qDebug("Received SIGINT.");
+
+       if (g_app)
+               g_app->quit();
+}
+
 int main(int argc, char *argv[])
 {
        int ret = 0;
        struct sr_context *sr_ctx = NULL;
+       const char *open_file = NULL;
+
+       // Register a SIGINT handler
+       signal(SIGINT, sigint_handler);
 
        QApplication a(argc, argv);
+       // Now we have an application to populate our global pointer
+       g_app = &a;
 
        // Set some application metadata
        QApplication::setApplicationVersion(PV_VERSION_STRING);
@@ -60,20 +82,29 @@ int main(int argc, char *argv[])
        // Parse arguments
        while (1) {
                static const struct option long_options[] = {
-                       {"version", no_argument, 0,  'V'},
-                       {"help", no_argument, 0,  'h'},
+                       {"loglevel", required_argument, 0, 'l'},
+                       {"version", no_argument, 0, 'V'},
+                       {"help", no_argument, 0, 'h'},
                        {0, 0, 0, 0}
                };
 
-               const char c = getopt_long(argc, argv,
-                       "Vh?", long_options, NULL);
+               const int c = getopt_long(argc, argv,
+                       "l:Vh?", long_options, NULL);
                if (c == -1)
                        break;
 
                switch (c) {
+               case 'l':
+               {
+                       const int loglevel = atoi(optarg);
+                       sr_log_loglevel_set(loglevel);
+                       srd_log_loglevel_set(loglevel);
+                       break;
+               }
+
                case 'V':
                        // Print version info
-                       fprintf(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+                       fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
                        return 0;
 
                case 'h':
@@ -83,6 +114,12 @@ int main(int argc, char *argv[])
                }
        }
 
+       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];
+
        // Initialise libsigrok
        if (sr_init(&sr_ctx) != SR_OK) {
                qDebug() << "ERROR: libsigrok init failed.";
@@ -98,7 +135,7 @@ int main(int argc, char *argv[])
                // Initialize all libsigrok drivers
                sr_dev_driver **const drivers = sr_driver_list();
                for (sr_dev_driver **driver = drivers; *driver; driver++) {
-                       if (sr_driver_init(*driver) != SR_OK) {
+                       if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
                                qDebug("Failed to initialize driver %s",
                                        (*driver)->name);
                                ret = 1;
@@ -106,9 +143,9 @@ int main(int argc, char *argv[])
                        }
                }
 
-               if(ret == 0) {
+               if (ret == 0) {
                        // Initialise the main window
-                       pv::MainWindow w;
+                       pv::MainWindow w(open_file);
                        w.show();
 
                        // Run the application