fetch callback support in perl RRDs module.

diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs
index ca7e166ff77862b40b590f1510d02dd972ce0cc3..9f7c21194a6f7fedd81bc352db81c0c0d7a304d2 100644 (file)
--- a/bindings/perl-shared/RRDs.xs
+++ b/bindings/perl-shared/RRDs.xs
@@ -113,6 +113,183 @@ extern "C" {
 */
 
 
+static SV * rrd_fetch_cb_svptr = (SV*)NULL;
+
+static int rrd_fetch_cb_wrapper(
+    const char     *filename,  /* name of the rrd */
+    enum cf_en     cf_idx, /* consolidation function */
+    time_t         *start,
+    time_t         *end,       /* which time frame do you want ?
+                                * will be changed to represent reality */
+    unsigned long  *step,      /* which stepsize do you want? 
+                                * will be changed to represent reality */
+    unsigned long  *ds_cnt,    /* number of data sources in file */
+    char           ***ds_namv, /* names of data_sources */
+    rrd_value_t    **data)     /* two dimensional array containing the data */
+  {
+    dSP;
+    HV *callHV;
+    SV *retSV;
+    HV *retHV;
+    HE *retHE;
+    AV *retAV;
+    char *cfStr;
+    unsigned long i,ii; 
+    unsigned long rowCount = 0;
+    if (!rrd_fetch_cb_svptr){
+        rrd_set_error("Use RRDs::register_fetch_cb to register a fetch callback.");
+        return -1;
+    }
+
+    ENTER;
+    SAVETMPS;
+    /* prepare the arguments */
+    callHV = newHV();
+    hv_store_ent(callHV, sv_2mortal(newSVpv("filename",0)),newSVpv(filename,0),0);
+    switch(cf_idx){
+        case CF_AVERAGE:
+            cfStr = "AVERAGE";
+            break;
+        case CF_MINIMUM:
+            cfStr = "MIN";
+            break;
+        case CF_MAXIMUM:
+            cfStr = "MAX";
+            break;
+        case CF_LAST:
+            cfStr = "LAST";
+    }
+    hv_store_ent(callHV, sv_2mortal(newSVpv("cd",0)),newSVpv(cfStr,0),0);
+    hv_store_ent(callHV, sv_2mortal(newSVpv("start",0)),newSVuv(*start),0);
+    hv_store_ent(callHV, sv_2mortal(newSVpv("end",0)),newSVuv(*end),0);
+    hv_store_ent(callHV, sv_2mortal(newSVpv("step",0)),newSVuv(*step),0);
+    PUSHMARK(SP);
+    XPUSHs(newRV_noinc((SV *)callHV));
+    PUTBACK;
+    /* Call the Perl sub to process the callback */
+    call_sv(rrd_fetch_cb_svptr , G_EVAL|G_SCALAR);
+    SPAGAIN;
+    /* Check the eval first */
+    if (SvTRUE(ERRSV)) {
+        rrd_set_error("perl callback failed: %s",SvPV_nolen(ERRSV));
+        POPs; /* there is undef on top of the stack when there is an error
+                 and call_sv was initiated with G_EVAL|G_SCALER */
+        goto error_out;
+    }
+    retSV = POPs;
+    if (!SvROK(retSV)){
+        rrd_set_error("Expected the perl callback function to return a reference");
+        goto error_out;
+    }
+    retHV = SvRV(retSV);
+    if (SvTYPE(retHV) != SVt_PVHV) {
+        rrd_set_error("Expected the perl callback function to return a hash reference");
+        goto error_out;
+    }
+
+#define loadRet(hashKey) \
+    if (( retHE = hv_fetch_ent(retHV,sv_2mortal(newSVpv(hashKey,0)),0,0)) == NULL){ \
+        rrd_set_error("Expected the perl callback function to return a '" hashKey "' value"); \
+        goto error_out; }
+
+    loadRet("step");
+    *step = SvIV(HeVAL(retHE));
+    if (*step <= 0){
+        rrd_set_error("Expected the perl callback function to return a valid step value");
+        goto error_out;        
+    }
+
+    loadRet("start");    
+    *start = SvIV(HeVAL(retHE));
+    if (*start == 0){
+        rrd_set_error("Expected the perl callback function to return a valid start value");
+        goto error_out;        
+    }
+
+    /* figure out how long things are so that we can allocate the memory */
+    loadRet("data");
+    retSV = HeVAL(retHE);
+    if (!SvROK(retSV)){
+        rrd_set_error("Expected the perl callback function to return a valid data element");
+        goto error_out;        
+    }
+    retHV = SvRV(retSV);
+    if (SvTYPE(retHV) != SVt_PVHV){
+        rrd_set_error("Expected the perl callback function to return data element pointing to a hash");
+        goto error_out;
+    }
+
+    *ds_cnt = hv_iterinit(retHV);
+    
+    if (((*ds_namv) = (char **) calloc( *ds_cnt , sizeof(char *))) == NULL) {
+        rrd_set_error("Failed to allocate memory for ds_namev when returning from perl callback");
+        goto error_out;    
+    }
+
+    for (i=0;i<*ds_cnt;i++){
+        char *retKey;
+        I32 retKeyLen;
+        HE* hash_entry;
+        hash_entry = hv_iternext(retHV);
+        retKey = hv_iterkey(hash_entry,&retKeyLen);
+        if ((((*ds_namv)[i]) = (char*)malloc(sizeof(char) * DS_NAM_SIZE)) == NULL) {
+            rrd_set_error("malloc fetch ds_namv entry");
+            goto error_out_free_ds_namv;
+        }
+        strncpy((*ds_namv)[i], retKey, DS_NAM_SIZE - 1);
+        (*ds_namv)[i][DS_NAM_SIZE - 1] = '\0';
+        retSV = hv_iterval(retHV,hash_entry);
+        if (!SvROK(retSV)){
+            rrd_set_error("Expected the perl callback function to return an array pointer for {data}->{%s}",(*ds_namv)[i]);
+            goto error_out_free_ds_namv;        
+        }
+        retAV = SvRV(retSV);
+        if (SvTYPE(retAV) != SVt_PVAV){
+            rrd_set_error("Expected the perl callback function to return an array pointer for {data}->{%s}",(*ds_namv)[i]);
+            goto error_out_free_ds_namv;        
+        }
+        if (av_len(retAV) > rowCount)
+            rowCount = av_len(retAV);
+    }
+    rowCount++; /* av_len returns the last index */
+    if (((*data) = (rrd_value_t*)malloc(*ds_cnt * rowCount * sizeof(rrd_value_t))) == NULL) {
+        rrd_set_error("malloc fetch data area");
+        goto error_out_free_ds_namv;
+    }
+
+    for (i=0;i<*ds_cnt;i++){
+        retAV = SvRV(HeVAL(hv_fetch_ent(retHV,sv_2mortal(newSVpv((*ds_namv)[i],0)),0,0)));
+        for (ii=0;ii<rowCount;ii++){
+            SV** valP = av_fetch(retAV,ii,0);
+            SV* val = valP ? *valP : &PL_sv_undef;
+            (*data)[i + ii * (*ds_cnt)] = SvNIOK(val) ? SvNVx(val) : DNAN;
+        }
+    }
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    return 1;
+
+    error_out_free_ds_namv:
+
+    for (i = 0; i < *ds_cnt; ++i){
+        if ((*ds_namv)[i]){
+            free((*ds_namv)[i]);
+        }
+    }
+
+    free(*ds_namv);
+
+    error_out:
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    return -1;
+
+    /* prepare return data */
+}
+
+
 MODULE = RRDs  PACKAGE = RRDs  PREFIX = rrd_
 
 BOOT:
@@ -288,6 +465,16 @@ rrd_fetch(...)
                PUSHs(sv_2mortal(newRV_noinc((SV*)names)));
                PUSHs(sv_2mortal(newRV_noinc((SV*)retar)));
 
+SV *
+rrd_fetch_cb_register(cb)
+    SV * cb
+    CODE:
+        if (rrd_fetch_cb_svptr == (SV*)NULL )
+            rrd_fetch_cb_svptr = newSVsv(cb);
+        else
+            SvSetSV(rrd_fetch_cb_svptr,cb);
+        rrd_fetch_cb_register(rrd_fetch_cb_wrapper);
+
 SV *
 rrd_times(start, end)
          char *start

diff --git a/bindings/perl-shared/t/callback.t b/bindings/perl-shared/t/callback.t
new file mode 100755 (executable)
index 0000000..68b2adb
--- /dev/null
+++ b/bindings/perl-shared/t/callback.t
@@ -0,0 +1,64 @@
+#! /usr/bin/perl 
+use Data::Dumper;
+
+use FindBin;
+
+BEGIN { $| = 1; print "1..1\n"; }
+END {
+  print "not ok 1\n" unless $loaded;
+  unlink "demo.rrd";
+}
+
+sub ok
+{
+    my($what, $result) = @_ ;
+    $ok_count++;
+    print "not " unless $result;
+    print "ok $ok_count $what\n";
+}
+
+use strict;
+use vars qw(@ISA $loaded);
+
+use RRDs;
+$loaded = 1;
+my $ok_count = 1;
+
+ok("loading",1);
+
+
+RRDs::fetch_cb_register(sub{
+    my $request = shift;
+    print STDERR Dumper $request;
+    my $items = ($request->{end}-$request->{start})/$request->{step};
+    return {
+      step=>200,
+      start=>$request->{start},
+      data => {
+        a=>[ map{ sin($_/200) } (0..$items) ],
+        b=>[ map{ cos($_/200) } (10..$items) ],
+        c=>[ map{ sin($_/100) } (100..$items) ],
+      }
+    };
+});
+
+my $result = RRDs::graphv "callback.png",
+  "--title", "Callback Demo", 
+  "--start", "now",
+  "--end", "start+1d",
+  "--lower-limit=0",
+  "--interlace", 
+  "--imgformat","PNG",
+  "--width=450",
+  "DEF:a=cb//extrainfo:a:AVERAGE",
+  "DEF:b=cb//:b:AVERAGE",
+  "DEF:c=cb//:c:AVERAGE",
+  "LINE:a#00b6e4:a",
+  "LINE:b#10b634:b",
+  "LINE:c#503d14:c";
+
+if (my $ERROR = RRDs::error) {
+   die "RRD ERROR: $ERROR\n";
+}
+
+print Dumper $result;
\ No newline at end of file

diff --git a/doc/librrd.pod b/doc/librrd.pod
index 06d0a40334e792e218c668880eaf6f9b30ce4c98..caeff27a880c24c1bd335aec7cffcaade3ee24c5 100644 (file)
--- a/doc/librrd.pod
+++ b/doc/librrd.pod
@@ -57,6 +57,20 @@ when it is called for the first time, nor for the last time. If you require
 this for initialization and cleanup you should do those tasks before and
 after calling B<rrd_dump_cr_r> respectively.
 
+=item B<rrd_fetch_cb_register(rrd_fetch_cb_t c)>
+
+If your data does not reside in rrd files, but you would like to draw charts using the
+rrd_graph functionality, you can supply your own rrd_fetch function and register it using
+the B<rrd_fetch_cb_register> function.
+
+The argument signature and api must be the same of the callback function must be aequivalent to the on of B<rrd_fetch_fn> in 
+F<rrd_fetch.c>.
+
+To activate the callback function you can use the pseudo filename F<cb//>I<free_form_text>.
+
+Note that rrdtool graph will not ask the same rrd for data twice. It determines this by building a key out of the
+values supplied to the fetch function. If the values are the same, the previous answer will be used.
+
 =back
 
 =head1 UTILITY FUNCTIONS

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 45e2a09eb049196a5100c2b0102e1fedb7f504c6..2c869b3518d14cf30a435a73bbff09fab5c024c2 100644 (file)
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
@@ -292,7 +292,7 @@ int rrd_fetch_fn(
        return rrd_fetch_fn_libdbi(filename,cf_idx,start,end,step,ds_cnt,ds_namv,data);
     }
 #endif
-    if (strncmp("cb//",filename,5)==0) {
+    if (strncmp("cb//",filename,4)==0) {
        return rrd_fetch_fn_cb(filename,cf_idx,start,end,step,ds_cnt,ds_namv,data);
     }
 

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index b3be4d96ca7334c4619dc9f85d3ff45c1b358d9a..81bde24d4747e73b55bc3ce1775ea5fa72357860 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -965,7 +965,8 @@ int data_fetch(
                           im->gdes[i].ds_nam, im->gdes[i].rrd);
             return -1;
         }
-
+        // remember that we already got this one
+        g_hash_table_insert(im->rrd_map,gdes_fetch_key(im->gdes[i]),GINT_TO_POINTER(i));
     }
     return 0;
 }