hal/sm_io/sm_io_bootstrap.*: add SMIO config thread entry point

This is the first step towards the github issue #11. In that we use the liblcient to configure some default values for us.

hal/sm_io/sm_io_bootstrap.*: add SMIO config thread entry point
This is the first step towards the github issue #11. In that we use the liblcient to configure some default values for us.
9015c80d · Lucas Russo · 8e5d2e9f · 9015c80d · 9015c80d
Commit 9015c80d authored Jul 18, 2014 by Lucas Russo
Hide whitespace changes
Inline Side-by-side

Showing with 45 additions and 1 deletion

sm_io_bootstrap.c hal/sm_io/sm_io_bootstrap.c +30 -1

sm_io_bootstrap.h hal/sm_io/sm_io_bootstrap.h +15 -0

No files found.
--- a/hal/sm_io/sm_io_bootstrap.c
+++ b/hal/sm_io/sm_io_bootstrap.c
@@ -104,7 +104,36 @@ err_self_alloc:
    free (smio_service);
 err_smio_service_alloc:
    DBE_DEBUG (DBG_SM_IO | DBG_LVL_ERR, "[sm_io_bootstrap] Thread exiting\n");
-    free (args);
+    free (th_args);
+    return;
+}
+
+/************************************************************/
+/*************** SMIO Config Thread entry-point  ************/
+/************************************************************/
+void smio_config_defaults (void *args, zctx_t *ctx, void *pipe)
+{
+    (void) pipe;
+    (void) ctx;
+    th_config_args_t *th_args = (th_config_args_t *) args;
+
+    DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io_bootstrap] Config thread starting ...\n");
+    DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io_bootstrap] Thread allocating resources ...\n");
+
+    /* We must export our service as the combination of the
+     * devio name (coming from devio parent) and our own name ID
+     * followed by an optional parameter coming from priv pointer */
+    char *smio_service = halutils_concat_strings (th_args->service,
+            smio_mod_dispatch[th_args->smio_id].name, ':');
+    ASSERT_ALLOC(smio_service, err_smio_service_alloc);
+
+    SMIO_DISPATCH_FUNC_WRAPPER_GEN(config_defaults, th_args->broker,
+            smio_service, th_args->log_file);
+
+    free (smio_service);
+err_smio_service_alloc:
+    DBE_DEBUG (DBG_SM_IO | DBG_LVL_INFO, "[sm_io_bootstrap] Config thread exiting\n");
+    free (th_args);
    return;
 }


--- a/hal/sm_io/sm_io_bootstrap.h
+++ b/hal/sm_io/sm_io_bootstrap.h
@@ -47,11 +47,15 @@ typedef smio_err_e (*smio_init_fp)(struct _smio_t *self);
 /* Destroy instance of sm)io functuion pointer. This tells how to destroy
 * such an object */
 typedef smio_err_e (*smio_shutdown_fp)(struct _smio_t *self);
+/* Configure SMIO default values using the libclient */
+typedef smio_err_e (*smio_config_defaults_fp)(char *broker_endp, char *service,
+        const char *log_file_name);

 /* Main class object that every sm_io must implement */
 struct _smio_bootstrap_ops_t {
    smio_init_fp init;
    smio_shutdown_fp shutdown;
+    smio_config_defaults_fp config_defaults;
 };

 typedef struct _smio_bootstrap_ops_t smio_bootstrap_ops_t;
@@ -69,10 +73,21 @@ struct _th_boot_args_t {

 typedef struct _th_boot_args_t th_boot_args_t;

+/* Config thread args structure */
+struct _th_config_args_t {
+    uint32_t smio_id;               /* ID of the SMIO instance */
+    char *broker;                   /* Endpoint to connect to broker */
+    char *service;                  /* Full name of the exported service */
+    char *log_file;                 /* Thread log file */
+};
+
+typedef struct _th_config_args_t th_config_args_t;
+
 /************************************************************/
 /************************ Our methods ***********************/
 /************************************************************/
 void smio_startup (void *args, zctx_t *ctx, void *pipe);
+void smio_config_defaults (void *args, zctx_t *ctx, void *pipe);
 struct _smio_t *smio_new (struct _devio_t *parent, struct _zctx_t *ctx, void *pipe,
        char *broker, char *service, int verbose);
 smio_err_e smio_destroy (struct _smio_t **self_p);