dev_mngr/*: add config file option to the command-line

Now, we don't specify the configuration filename through the Makefile, but in the command-line of dev_mngr.

dev_mngr/*: add config file option to the command-line
Now, we don't specify the configuration filename through the Makefile, but in the command-line of dev_mngr.
d1c97561 · Lucas Russo · 0e330e8a · d1c97561 · d1c97561 · d1c97561
Commit d1c97561 authored Oct 09, 2015 by Lucas Russo
Hide whitespace changes
Inline Side-by-side

Showing with 72 additions and 17 deletions

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

dev_mngr.c src/dev_mngr/dev_mngr.c +31 -17

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

No files found.
--- a/include/dev_mngr_core.h
+++ b/include/dev_mngr_core.h
@@ -71,6 +71,12 @@ dmngr_err_e dmngr_spawn_chld (dmngr_t *self, const char *program, char *const ar

 /* Setting all operations at once */
 dmngr_err_e dmngr_set_ops (dmngr_t *self, dmngr_ops_t *dmngr_ops);
+/* Set configuration filename */
+dmngr_err_e dmngr_set_cfg_file (dmngr_t *self, char *cfg_file);
+/* Get const reference to configuration filename */
+const char * dmngr_get_cfg_file (dmngr_t *self);
+/* Clone configuration filename */
+char * dmngr_clone_cfg_file (dmngr_t *self);
 /* Is broker Running? */
 bool dmngr_is_broker_running (dmngr_t *self);
 /* Spawn broker if not running */

--- a/src/dev_mngr/dev_mngr.c
+++ b/src/dev_mngr/dev_mngr.c
@@ -36,21 +36,10 @@

 #define DFLT_LOG_DIR                "stdout"

-#ifdef __CFG_DIR__
-#define CFG_DIR                     STRINGIFY(__CFG_DIR__)
-#else
-#error "Config directory not defined!"
-#endif
-
-#ifdef __CFG_FILENAME__
-#define CFG_FILENAME                STRINGIFY(__CFG_FILENAME__)
-#else
-#error "Config filename not defined!"
-#endif
-
 void print_help (char *program_name)
 {
    printf( "Usage: %s [options]\n"
+            "\t-f Configuration file\n"
            "\t-h This help message\n"
            "\n\t Most of the options resides at the bpm_sw configuration file,\n"
            "typically located in /etc/bpm_sw", program_name);
@@ -58,16 +47,34 @@ void print_help (char *program_name)

 int main (int argc, char *argv[])
 {
+    char *cfg_file = NULL;
+    char **str_p = NULL;
+    int i;
+
+    if (argc < 2) {
+        print_help (argv[0]);
+        exit (1);
+    }
+
    /* Simple handling of command-line options. This should be done
     * with getopt, for instance*/
-    int i;
    for (i = 1; i < argc; i++)
    {
-        if (streq(argv[i], "-h"))
-        {
+        if (streq (argv[i], "-f")) {
+            str_p = &cfg_file;
+            DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_TRACE, "[dev_mngr] Will set cfg_file parameter\n");
+        }
+        else if (streq(argv[i], "-h")) {
            print_help (argv [0]);
            exit (1);
        }
+        /* Fallout for options with parameters */
+        else {
+            if (str_p) {
+                *str_p = strdup (argv[i]);
+                DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_TRACE, "[dev_mngr] Parameter set to \"%s\"\n", *str_p);
+            }
+        }
    }

    zhash_t *dmngr_hints = zhash_new ();
@@ -82,7 +89,7 @@ int main (int argc, char *argv[])
    /**************************************************************************/

    /* Check for field not found */
-    zconfig_t *root_cfg = zconfig_load (CFG_DIR "/" CFG_FILENAME);
+    zconfig_t *root_cfg = zconfig_load (cfg_file);
    if (root_cfg == NULL) {
        DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_FATAL, "[dev_mngr] Could not load "
                "configuration file\n");
@@ -245,6 +252,12 @@ int main (int argc, char *argv[])
        goto err_dmngr_alloc;
    }

+    dmngr_err_e err = dmngr_set_cfg_file (dmngr, cfg_file);
+    if (err != DMNGR_SUCCESS) {
+        DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_FATAL, "[dev_mngr] Fail set configuration file\n");
+        goto err_dmngr_set_cfg_file;
+    }
+
 #if 0
    dmngr_sig_handler_t dmngr_sigkill_handler =
    {   .signal = SIGKILL,
@@ -269,7 +282,7 @@ int main (int argc, char *argv[])
    dmngr_set_wait_clhd_handler (dmngr, &hutils_wait_chld);
    dmngr_set_spawn_clhd_handler (dmngr, &hutils_spawn_chld);

-    dmngr_err_e err = dmngr_register_sig_handlers (dmngr);
+    err = dmngr_register_sig_handlers (dmngr);
    if (err != DMNGR_SUCCESS) {
        DBE_DEBUG (DBG_DEV_MNGR | DBG_LVL_FATAL, "[dev_mngr] dmngr_register_sig_handler error!\n");
        goto err_sig_handlers;
@@ -334,6 +347,7 @@ err_scan_devs:
 err_spawn_broker:
 err_sig_handlers:
    dmngr_destroy (&dmngr);
+err_dmngr_set_cfg_file:
 err_dmngr_alloc:
 err_daemonize:
    zconfig_destroy (&root_cfg);

--- a/src/dev_mngr/dev_mngr_core.c
+++ b/src/dev_mngr/dev_mngr_core.c
@@ -71,6 +71,7 @@ struct _dmngr_t {
    zsock_t *dealer;            /* zeroMQ Dealer socket */
    char *name;                 /* Identification of this dmngr instance */
    char *endpoint;             /* Endpoint to connect to */
+    char *cfg_file;             /* Configuration file location */
    int verbose;                /* Print activity to stdout */

    /* General management operations */
@@ -304,6 +305,40 @@ dmngr_err_e dmngr_set_ops (dmngr_t *self, dmngr_ops_t *dmngr_ops)
    return DMNGR_SUCCESS;
 }

+dmngr_err_e dmngr_set_cfg_file (dmngr_t *self, char *cfg_file)
+{
+    assert (self);
+    assert (cfg_file);
+
+    dmngr_err_e err = DMNGR_SUCCESS;
+
+    /* Free previously allocated file */
+    if (self->cfg_file != NULL) {
+        free (self->cfg_file);
+        self->cfg_file = NULL;
+    }
+
+    self->cfg_file = strdup (cfg_file);
+    ASSERT_ALLOC(self->cfg_file, err_set_cfg_file);
+
+err_set_cfg_file:
+    return err;
+}
+
+const char * dmngr_get_cfg_file (dmngr_t *self)
+{
+    assert (self);
+    return self->cfg_file;
+}
+
+char * dmngr_clone_cfg_file (dmngr_t *self)
+{
+    assert (self);
+
+    char *cfg_file_cpy = strdup (self->cfg_file);
+    return cfg_file_cpy;
+}
+
 static bool _dmngr_is_broker_running (dmngr_t *self)
 {
    assert (self);