bump version to 1.4.1

[librados2-perl.git] / RADOS.xs

diff --git a/RADOS.xs b/RADOS.xs
index 66fa65a50222ee54560b274dbb801a9fb8c62921..45f634c3f3bfc4c87aa7b98733f2b78965a9176c 100644 (file)
--- a/RADOS.xs
+++ b/RADOS.xs
@@ -14,12 +14,19 @@
 MODULE = PVE::RADOS            PACKAGE = PVE::RADOS
 
 rados_t
-pve_rados_create()
-PROTOTYPE:
+pve_rados_create(user)
+SV *user
+PROTOTYPE: $
 CODE:
 {
+    char *u = NULL;
     rados_t clu = NULL;
-    int ret = rados_create(&clu, NULL);
+
+    if (SvOK(user)) {
+       u = SvPV_nolen(user);
+    }
+
+    int ret = rados_create(&clu, u);
 
     if (ret == 0)
         RETVAL = clu;
@@ -47,19 +54,35 @@ CODE:
 }
 
 void
-pve_rados_connect(cluster)
+pve_rados_conf_read_file(cluster, path)
 rados_t cluster
-PROTOTYPE: $
+SV *path
+PROTOTYPE: $$
 CODE:
 {
-    DPRINTF("pve_rados_connect\n");
+    char *p = NULL;
+
+    if (SvOK(path)) {
+       p = SvPV_nolen(path);
+    }
+
+    DPRINTF("pve_rados_conf_read_file %s\n", p);
 
-    int res = rados_conf_read_file(cluster, NULL);
+    int res = rados_conf_read_file(cluster, p);
     if (res < 0) {
         die("rados_conf_read_file failed - %s\n", strerror(-res));
     }
+}
 
-    res = rados_connect(cluster);
+void
+pve_rados_connect(cluster)
+rados_t cluster
+PROTOTYPE: $
+CODE:
+{
+    DPRINTF("pve_rados_connect\n");
+
+    int res = rados_connect(cluster);
     if (res < 0) {
         die("rados_connect failed - %s\n", strerror(-res));
     }
@@ -75,7 +98,7 @@ CODE:
     rados_shutdown(cluster);
 }
 
-SV *
+HV *
 pve_rados_mon_command(cluster, cmds)
 rados_t cluster
 AV *cmds
@@ -101,21 +124,27 @@ CODE:
         cmdlen++;
     }
 
-    int ret = rados_mon_command(cluster, cmd, cmdlen,
-                                NULL, 0,
-                                &outbuf, &outbuflen,
-                                &outs, &outslen);
+    int ret = rados_mon_command(
+        cluster,
+        cmd,
+        cmdlen,
+        NULL,
+        0,
+        &outbuf,
+        &outbuflen,
+        &outs,
+        &outslen
+    );
 
-    if (ret < 0) {
-        char msg[4096];
-        snprintf(msg, sizeof(msg), "mon_command failed - %s\n", outs);
-        rados_buffer_free(outs);
-        die(msg);
-    }
+    HV * rh = (HV *)sv_2mortal((SV *)newHV());
 
-    RETVAL = newSVpv(outbuf, outbuflen);
+    (void)hv_store(rh, "return_code", 11, newSViv(ret), 0);
+    (void)hv_store(rh, "status_message", 14, newSVpv(outs, outslen), 0);
+    (void)hv_store(rh, "data", 4, newSVpv(outbuf, outbuflen), 0);
+    RETVAL = rh;
 
     rados_buffer_free(outbuf);
+    rados_buffer_free(outs);
 }
 OUTPUT: RETVAL