rpcsvc: allow creation of both rdma and socket for a single server transport.

Signed-off-by: Raghavendra G <raghavendra@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 513 (Introduce 0 copy rdma)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=513

2 files changed, 100 insertions, 4 deletions

diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 88675205c..01b441317 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -1600,11 +1600,12 @@ out:
 }
 
 
-rpcsvc_listener_t *
+int32_t
 rpcsvc_create_listener (rpcsvc_t *svc, dict_t *options, char *name)
 {
         rpc_transport_t   *trans    = NULL;
         rpcsvc_listener_t *listener = NULL;
+        int32_t            ret      = -1; 
 
         if (!svc || !options) {
                 goto out;
@@ -1620,12 +1621,107 @@ rpcsvc_create_listener (rpcsvc_t *svc, dict_t *options, char *name)
                 goto out;
         }
 
+        ret = 0;
 out:
         if (!listener && trans) {
                 rpc_transport_disconnect (trans);
         }
 
-        return listener;
+        return ret;
+}
+
+
+int32_t
+rpcsvc_create_listeners (rpcsvc_t *svc, dict_t *options, char *name)
+{
+        int32_t  ret            = -1, count = 0;
+        data_t  *data           = NULL;
+        char    *str            = NULL, *ptr = NULL, *transport_name = NULL;
+        char    *transport_type = NULL, *saveptr = NULL;
+
+        if ((svc == NULL) || (options == NULL) || (name == NULL)) {
+                goto out;
+        }
+         
+        data = dict_get (options, "transport-type");
+        if (data == NULL) {
+                gf_log (GF_RPCSVC, GF_LOG_DEBUG,
+                        "option transport-type not set");
+                goto out;
+        }
+
+        transport_type = data_to_str (data);
+        if (transport_type == NULL) {
+                gf_log (GF_RPCSVC, GF_LOG_DEBUG,
+                        "option transport-type not set");
+                goto out;
+        }
+
+        /* duplicate transport_type, since following dict_set will free it */
+        transport_type = gf_strdup (transport_type);
+        if (transport_type == NULL) {
+                gf_log (GF_RPCSVC, GF_LOG_ERROR, "out of memory");
+                goto out;
+        }
+
+        str = gf_strdup (transport_type);
+        if (str == NULL) {
+                gf_log (GF_RPCSVC, GF_LOG_ERROR, "out of memory");
+                goto out;
+        }
+
+        ptr = strtok_r (str, ",", &saveptr);
+
+        while (ptr != NULL) {
+                ptr = gf_strdup (ptr);
+                if (ptr == NULL) {
+                        gf_log (GF_RPCSVC, GF_LOG_ERROR, "out of memory");
+                        goto out;
+                }
+
+                ret = dict_set_dynstr (options, "transport-type", ptr);
+                if (ret == -1) {
+                        goto out;
+                }
+
+                ret = asprintf (&transport_name, "%s.%s", ptr, name);
+                if (ret == -1) {
+                        goto out;
+                }
+
+                ret = rpcsvc_create_listener (svc, options, transport_name);
+                if (ret != 0) {
+                        goto out;
+                }
+
+                count++;
+
+                ptr = strtok_r (NULL, ",", &saveptr);
+        }
+
+        ptr = NULL;
+
+        ret = dict_set_dynstr (options, "transport-type", transport_type);
+        if (ret == -1) {
+                goto out;
+        }
+
+        transport_type = NULL;
+
+out:
+        if (str != NULL) {
+                GF_FREE (str);
+        }
+
+        if (transport_type != NULL) {
+                GF_FREE (transport_type);
+        }
+
+        if (ptr != NULL) {
+                GF_FREE (ptr);
+        }
+
+        return count;
 }
 
 
diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h
index 0a3e91da7..06b0aad22 100644
--- a/rpc/rpc-lib/src/rpcsvc.h
+++ b/rpc/rpc-lib/src/rpcsvc.h
@@ -392,8 +392,8 @@ rpcsvc_program_unregister (rpcsvc_t *svc, rpcsvc_program_t *program);
  * rpcsvc_program_register_portmap.
  */
 /* FIXME: can multiple programs registered on same port? */
-extern rpcsvc_listener_t *
-rpcsvc_create_listener (rpcsvc_t *svc, dict_t *options, char *name);
+extern int32_t
+rpcsvc_create_listeners (rpcsvc_t *svc, dict_t *options, char *name);
 
 void
 rpcsvc_listener_destroy (rpcsvc_listener_t *listener);