dev_io/dev_io_core.c: add $REGISTER_SM command to pipe handling

This will allow DEVIO clients to register SMIOs by sending messages to its pipe.

dev_io/dev_io_core.c: add $REGISTER_SM command to pipe handling
This will allow DEVIO clients to register SMIOs by sending messages to its pipe.
579bebc2 · Lucas Russo · 074bf433 · 579bebc2
Commit 579bebc2 authored Apr 19, 2016 by Lucas Russo
Show whitespace changes
Inline Side-by-side

Showing with 24 additions and 7 deletions

dev_io_core.c src/dev_io/dev_io_core.c +24 -7

No files found.
--- a/src/dev_io/dev_io_core.c
+++ b/src/dev_io/dev_io_core.c
@@ -676,31 +676,48 @@ static int _devio_handle_pipe (zloop_t *loop, zsock_t *reader, void *args)
 {
    (void) loop;
-    char *command = NULL;
    /* We expect a devio instance e as reference */
    devio_t *devio = (devio_t *) args;
-    (void) devio;
+    char *command = NULL;
+    uint32_t smio_id;
+    uint64_t base;
+    uint32_t inst_id;
-    /* Receive message */
+    /* This command expects one of the following */
-    zmsg_t *recv_msg = zmsg_recv (reader);
+    /* Command: (string) $REGISTER_SMIO
-    if (recv_msg == NULL) {
+     * Arg1:    (uint32_t) smio_id
+     * Arg2:    (uint64_t) base
+     * Arg3:    (uint32_t) inst_id
+     *
+     * Command: (string) $TERM
+     *
+     * Either way, the following zsock_recv is able to handle both cases. In
+     * case of the received message is shorter than the first command, the
+     * additional pointers are zeroed.
+     * */
+    int zerr = zsock_recv (reader, "s484", &command, &smio_id, &base, &inst_id);
+    if (zerr == -1) {
        return -1; /* Interrupted */
    }
-    command = zmsg_popstr (recv_msg);
    if (streq (command, "$TERM")) {
        /* Shutdown the engine */
        free (command);
        zmsg_destroy (&recv_msg);
        return -1;
    }
+    else if (streq (command, "$REGISTER_SMIO")) {
+        /* Register new SMIO */
+        devio_register_sm (devio, smio_id, base, inst_id);
+    }
    else {
        /* Invalid message received. Discard message and continue normally */
        DBE_DEBUG (DBG_SM_IO | DBG_LVL_WARN, "[dev_io_core:_devio_handle_pipe] PIPE "
                "received an invalid command\n");
    }
-    zmsg_destroy (&recv_msg);
+    free (command);
    return 0;
 }