commit 72feadcff8f5ebcb3ad1ae2aa6877b512b106135
author Ben Tyner <ben.tyner@ibm.com> Mon Apr 06 12:57:31 2020 -0500
committer Zane Shelley <zshelle@us.ibm.com> Wed Apr 15 17:52:40 2020 +0000
tree e1bc76ef9bd0a9a19fe4f0a7e2f7db5d73454005
parent 8c2f8b24c3e2137f9c52a9d24d0089376c05f3d1

Moved configuration handling into cli handler code

Cleanup: moved the updating of configuration object to
command line handling code to remove some single-use booleans.

Signed-off-by: Ben Tyner <ben.tyner@ibm.com>
Change-Id: I503e72c07b35a1537d93241a26a92f87854ba105

listener.cpp

diff --git a/listener.cpp b/listener.cpp
index c8ae642..e0640aa 100644
--- a/listener.cpp
+++ b/listener.cpp
@@ -39,10 +39,6 @@
 {
     using namespace boost::interprocess;
 
-    // convert thread params to main arguments
-    int argc    = static_cast<MainArgs_t*>(i_params)->argc;
-    char** argv = static_cast<MainArgs_t*>(i_params)->argv;
-
     // vector to hold messages sent to listener
     std::vector<std::string> messages;
 
@@ -55,19 +51,8 @@
     // status of gpio monitor
     bool gpioMonEnabled = false;
 
-    // Parse command line args to see if any flags were passed, update the
-    // booleans accordingly and pass them to the config object constructor.
-    bool vital_enable     = true;
-    bool checkstop_enable = true;
-    bool ti_enable        = true;
-    bool bp_enable        = true;
-
-    // parse config options
-    parseConfig(argv, argv + argc, vital_enable, checkstop_enable, ti_enable,
-                bp_enable);
-
     // create config
-    attn::Config config(vital_enable, checkstop_enable, ti_enable, bp_enable);
+    attn::Config attnConfig;
 
     // initialize pdbg targets
     pdbg_targets_init(nullptr);
@@ -124,12 +109,7 @@
             }
 
             // parse config options
-            parseConfig(argv.data(), argv.data() + argc, vital_enable,
-                        checkstop_enable, ti_enable, bp_enable);
-
-            // set config
-            config.setConfig(vital_enable, checkstop_enable, ti_enable,
-                             bp_enable);
+            parseConfig(argv.data(), argv.data() + argc, &attnConfig);
 
             // start attention handler daemon?
             if (true ==
@@ -138,7 +118,7 @@
                 if (false == gpioMonEnabled)
                 {
                     if (0 == pthread_create(&ptidGpio, NULL, &threadGpioMon,
-                                            &config))
+                                            &attnConfig))
                     {
                         gpioMonEnabled = true;
                     }