dev_mngr/*: add spwan_broker configuration parameter

This allows us to selective spawn the broker. Useful in cases that the broker is an independent system service, as Malamute.

dev_mngr/*: add spwan_broker configuration parameter
This allows us to selective spawn the broker. Useful in cases that the broker is an independent system service, as Malamute.
546effac · Lucas Russo · 5b9a9959 · 546effac · 546effac · 546effac
Commit 546effac authored Oct 07, 2015 by Lucas Russo
Hide whitespace changes
Inline Side-by-side

Showing with 36 additions and 5 deletions

dev_mngr_core.h include/dev_mngr_core.h +2 -0

dev_mngr.c src/dev_mngr/dev_mngr.c +32 -5

dev_mngr_core.c src/dev_mngr/dev_mngr_core.c +2 -0

No files found.
--- a/include/dev_mngr_core.h
+++ b/include/dev_mngr_core.h
@@ -20,6 +20,8 @@ extern char *dmngr_verbose_str;
 extern int dmngr_verbose;
 extern char *dmngr_daemonize_str;
 extern int dmngr_daemonize;
+extern char *dmngr_spawn_broker_cfg_str;
+extern int dmngr_spawn_broker_cfg;

 /* Signal handler function pointer */
 typedef void (*sig_handler_fp)(int sig, siginfo_t *siginfo, void *context);

--- a/src/dev_mngr/dev_mngr.c
+++ b/src/dev_mngr/dev_mngr.c
@@ -171,6 +171,32 @@ int main (int argc, char *argv[])
    DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_INFO,
            "[dev_mngr] Daemonize set to \"%d\"\n", dmngr_daemonize);

+    /* Read spawn broker parameter */
+    dmngr_spawn_broker_cfg_str = zconfig_resolve (root_cfg, "/dev_mngr/spawn_broker", NULL);
+
+    /* Check for field not found */
+    if (dmngr_spawn_broker_cfg_str== NULL) {
+        DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_FATAL, "[dev_mngr] Could not find "
+                "spawn_broker in configuration file\n");
+        goto err_cfg_exit;
+    }
+    else {
+        if (streq (dmngr_spawn_broker_cfg_str, "yes")) {
+            dmngr_spawn_broker_cfg = 1;
+        }
+        else if (streq (dmngr_spawn_broker_cfg_str, "no")) {
+            dmngr_spawn_broker_cfg = 0;
+        }
+        else {
+            DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_FATAL, "[dev_mngr] Invalid option "
+                    "for spawn_broker configuration variable\n");
+            goto err_cfg_exit;
+        }
+    }
+
+    DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_INFO,
+            "[dev_mngr] spawn_broker set to \"%d\"\n", dmngr_spawn_broker_cfg);
+
    /* Read DEVIO suggested bind endpoints and fill the hash table with
     * the corresponding keys */
    hutils_err_e herr = hutils_get_hints (root_cfg, dmngr_hints);
@@ -180,7 +206,6 @@ int main (int argc, char *argv[])
        goto err_cfg_exit;
    }

-
    /**************************************************************************/
    /********************** END of configuration variables ********************/
    /**************************************************************************/
@@ -248,10 +273,12 @@ int main (int argc, char *argv[])
        /* DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_TRACE, "[dev_mngr] ., PID: %d\n", getpid()); */

        /* Spawn the broker if not running */
-        err = dmngr_spawn_broker (dmngr, dmngr_broker_endp);
-        if (err != DMNGR_SUCCESS) {
-            DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_FATAL, "[dev_mngr] Could not spwan broker!\n");
-            goto err_spawn_broker;
+        if (dmngr_spawn_broker_cfg == 1) {
+            err = dmngr_spawn_broker (dmngr, dmngr_broker_endp);
+            if (err != DMNGR_SUCCESS) {
+                DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_FATAL, "[dev_mngr] Could not spwan broker!\n");
+                goto err_spawn_broker;
+            }
        }

        /* Search for new devices */

--- a/src/dev_mngr/dev_mngr_core.c
+++ b/src/dev_mngr/dev_mngr_core.c
@@ -92,6 +92,8 @@ char *dmngr_verbose_str = NULL;
 int dmngr_verbose = 0;
 char *dmngr_daemonize_str = NULL;
 int dmngr_daemonize = 0;
+char *dmngr_spawn_broker_cfg_str = NULL;
+int dmngr_spawn_broker_cfg = 0;

 static void _devio_hash_free_item (void *data);
 static dmngr_err_e _dmngr_scan_devs (dmngr_t *self, uint32_t *num_devs_found);