X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=bindings%2Fperl-shared%2FRRDs.xs;h=3cf1d2470f1bb08eff09f84464ca5079a9aed6f2;hp=1340b6f8aeba242653ef78bb2bf72aaa6a59f4c4;hb=4d2717c87ff413758caaa7942d211e642846b9b0;hpb=3c6f40dc07acfbcb48480e4b3153a5f42f6e96fe

diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs
index 1340b6f..3cf1d24 100644
--- a/bindings/perl-shared/RRDs.xs
+++ b/bindings/perl-shared/RRDs.xs
@@ -10,7 +10,25 @@ extern "C" {
 }
 #endif
 
+/*
+ * rrd_tool.h includes config.h, but at least on Ubuntu Breezy Badger
+ * 5.10 with gcc 4.0.2, the C preprocessor picks up Perl's config.h
+ * which is included from the Perl includes and never reads rrdtool's
+ * config.h.  Without including rrdtool's config.h, this module does
+ * not compile, so include it here with an explicit path.
+ *
+ * Because rrdtool's config.h redefines VERSION which is originally
+ * set via Perl's Makefile.PL and passed down to the C compiler's
+ * command line, save the original value and reset it after the
+ * includes.
+ */
+#define VERSION_SAVED VERSION
+#undef VERSION
+#include "../../rrd_config.h"
 #include "../../src/rrd_tool.h"
+#undef VERSION
+#define VERSION VERSION_SAVED
+#undef VERSION_SAVED
 
 /* perl 5.004 compatibility */
 #if PERLPATCHLEVEL < 5 
@@ -29,7 +47,6 @@ extern "C" {
 		    argv[i+1] = (char *) malloc((strlen(handle)+1)*sizeof(char)); \
 		    strcpy(argv[i+1],handle); \
  	        } \
-		optind=0; opterr=0; \
 		rrd_clear_error();\
 		RETVAL=name(items+1,argv); \
 		for (i=0; i < items; i++) {\
@@ -39,6 +56,57 @@ extern "C" {
 		\
 		if (rrd_test_error()) XSRETURN_UNDEF;
 
+#define hvs(VAL) hv_store_ent(hash, sv_2mortal(newSVpv(data->key,0)),VAL,0)		    
+
+#define rrdinfocode(name) \
+		/* prepare argument list */ \
+		argv = (char **) malloc((items+1)*sizeof(char *)); \
+		argv[0] = "dummy"; \
+		for (i = 0; i < items; i++) { \
+		    STRLEN len; \
+		    char *handle= SvPV(ST(i),len); \
+		    /* actually copy the data to make sure possible modifications \
+		       on the argv data does not backfire into perl */ \
+		    argv[i+1] = (char *) malloc((strlen(handle)+1)*sizeof(char)); \
+		    strcpy(argv[i+1],handle); \
+ 	        } \
+                rrd_clear_error(); \
+                data=name(items+1, argv); \
+                for (i=0; i < items; i++) { \
+		    free(argv[i+1]); \
+		} \
+		free(argv); \
+                if (rrd_test_error()) XSRETURN_UNDEF; \
+                hash = newHV(); \
+   	        save=data; \
+                while (data) { \
+		/* the newSV will get copied by hv so we create it as a mortal \
+           to make sure it does not keep hanging round after the fact */ \
+		    switch (data->type) { \
+		    case RD_I_VAL: \
+			if (isnan(data->value.u_val)) \
+			    hvs(&PL_sv_undef); \
+			else \
+			    hvs(newSVnv(data->value.u_val)); \
+			break; \
+			case RD_I_INT: \
+			hvs(newSViv(data->value.u_int)); \
+			break; \
+		    case RD_I_CNT: \
+			hvs(newSViv(data->value.u_cnt)); \
+			break; \
+		    case RD_I_STR: \
+			hvs(newSVpv(data->value.u_str,0)); \
+			break; \
+		    case RD_I_BLO: \
+			hvs(newSVpv(data->value.u_blo.ptr,data->value.u_blo.size)); \
+			break; \
+		    } \
+		    data = data->next; \
+	        } \
+            rrd_info_free(save); \
+            RETVAL = newRV_noinc((SV*)hash);
+
 /*
  * should not be needed if libc is linked (see ntmake.pl)
 #ifdef WIN32
@@ -80,6 +148,17 @@ rrd_last(...)
       OUTPUT:
             RETVAL
 
+int
+rrd_first(...)
+      PROTOTYPE: @
+      PREINIT:
+      int i;
+      char **argv;
+      CODE:
+              rrdcode(rrd_first);
+      OUTPUT:
+            RETVAL
+
 
 int
 rrd_create(...)
@@ -120,12 +199,13 @@ rrd_tune(...)
 		RETVAL
 
 
-void
+SV *
 rrd_graph(...)
 	PROTOTYPE: @	
 	PREINIT:
-	char **calcpr;
+	char **calcpr=NULL;
 	int i,xsize,ysize;
+	double ymin,ymax;
 	char **argv;
 	AV *retar;
 	PPCODE:
@@ -139,9 +219,8 @@ rrd_graph(...)
 		    argv[i+1] = (char *) malloc((strlen(handle)+1)*sizeof(char));
 		    strcpy(argv[i+1],handle);
  	        }
-		optind=0; opterr=0; 
 		rrd_clear_error();
-		rrd_graph(items+1,argv,&calcpr,&xsize,&ysize); 
+		rrd_graph(items+1,argv,&calcpr,&xsize,&ysize,NULL,&ymin,&ymax); 
 		for (i=0; i < items; i++) {
 		    free(argv[i+1]);
 		}
@@ -166,7 +245,7 @@ rrd_graph(...)
 		PUSHs(sv_2mortal(newSViv(xsize)));
 		PUSHs(sv_2mortal(newSViv(ysize)));
 
-void
+SV *
 rrd_fetch(...)
 	PROTOTYPE: @	
 	PREINIT:
@@ -187,7 +266,6 @@ rrd_fetch(...)
 		    argv[i+1] = (char *) malloc((strlen(handle)+1)*sizeof(char));
 		    strcpy(argv[i+1],handle);
  	        }
-		optind=0; opterr=0; 
 		rrd_clear_error();
 		rrd_fetch(items+1,argv,&start,&end,&step,&ds_cnt,&ds_namv,&data); 
 		for (i=0; i < items; i++) {
@@ -220,6 +298,30 @@ rrd_fetch(...)
 		PUSHs(sv_2mortal(newRV_noinc((SV*)names)));
 		PUSHs(sv_2mortal(newRV_noinc((SV*)retar)));
 
+SV *
+rrd_times(start, end)
+	  char *start
+	  char *end
+	PREINIT:
+		rrd_time_value_t start_tv, end_tv;
+		char    *parsetime_error = NULL;
+		time_t	start_tmp, end_tmp;
+	PPCODE:
+		rrd_clear_error();
+		if ((parsetime_error = rrd_parsetime(start, &start_tv))) {
+			rrd_set_error("start time: %s", parsetime_error);
+			XSRETURN_UNDEF;
+		}
+		if ((parsetime_error = rrd_parsetime(end, &end_tv))) {
+			rrd_set_error("end time: %s", parsetime_error);
+			XSRETURN_UNDEF;
+		}
+		if (rrd_proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
+			XSRETURN_UNDEF;
+		}
+		EXTEND(sp,2);
+		PUSHs(sv_2mortal(newSVuv(start_tmp)));
+		PUSHs(sv_2mortal(newSVuv(end_tmp)));
 
 int
 rrd_xport(...)
@@ -242,7 +344,6 @@ rrd_xport(...)
 		    argv[i+1] = (char *) malloc((strlen(handle)+1)*sizeof(char));
 		    strcpy(argv[i+1],handle);
  	        }
-		optind=0; opterr=0; 
 		rrd_clear_error();
 		rrd_xport(items+1,argv,&xsize,&start,&end,&step,&col_cnt,&legend_v,&data); 
 		for (i=0; i < items; i++) {
@@ -284,59 +385,72 @@ SV*
 rrd_info(...)
 	PROTOTYPE: @	
 	PREINIT:
-		info_t *data,*save;
+		rrd_info_t *data,*save;
                 int i;
                 char **argv;
 		HV *hash;
 	CODE:
-		/* prepare argument list */
-		argv = (char **) malloc((items+1)*sizeof(char *));
-		argv[0] = "dummy";
-		for (i = 0; i < items; i++) { 
-		    STRLEN len;
-		    char *handle= SvPV(ST(i),len);
-		    /* actually copy the data to make sure possible modifications
-		       on the argv data does not backfire into perl */ 
-		    argv[i+1] = (char *) malloc((strlen(handle)+1)*sizeof(char));
-		    strcpy(argv[i+1],handle);
- 	        }
-		optind=0; opterr=0; 
-                rrd_clear_error();
-                data=rrd_info(items+1, argv);
-                for (i=0; i < items; i++) {
-		    free(argv[i+1]);
-		}
-		free(argv);
-                if (rrd_test_error()) XSRETURN_UNDEF;
-                hash = newHV();
-                while (data) {
-		    save=data;
-		/* the newSV will get copied by hv so we create it as a mortal to make sure
-                   it does not keep hanging round after the fact */
-#define hvs(VAL) hv_store_ent(hash, sv_2mortal(newSVpv(data->key,0)),VAL,0)		    
-		    switch (data->type) {
-		    case RD_I_VAL:
-			if (isnan(data->value.u_val))
-			    hvs(&PL_sv_undef);
-			else
-			    hvs(newSVnv(data->value.u_val));
-			break;
-		    case RD_I_CNT:
-			hvs(newSViv(data->value.u_cnt));
-			break;
-		    case RD_I_STR:
-			hvs(newSVpv(data->value.u_str,0));
-			rrd_freemem(data->value.u_str);
-			break;
-		    }
-#undefine hvs
-		    rrd_freemem(data->key);
-		    data = data->next;		    
-		    rrd_freemem(save);
-		}
-                rrd_freemem(data);
-                RETVAL = newRV_noinc((SV*)hash);
+		rrdinfocode(rrd_info);	
+    OUTPUT:
+	   RETVAL
+
+SV*
+rrd_updatev(...)
+	PROTOTYPE: @	
+	PREINIT:
+		rrd_info_t *data,*save;
+                int i;
+                char **argv;
+		HV *hash;
+	CODE:
+		rrdinfocode(rrd_update_v);	
+    OUTPUT:
+	   RETVAL
+
+SV*
+rrd_graphv(...)
+	PROTOTYPE: @	
+	PREINIT:
+		rrd_info_t *data,*save;
+                int i;
+                char **argv;
+		HV *hash;
+	CODE:
+		rrdinfocode(rrd_graph_v);	
+    OUTPUT:
+	   RETVAL
+
+int
+rrd_dump(...)
+       PROTOTYPE: @
+       PREINIT:
+        int i;
+       char **argv;
+       CODE:
+               rrdcode(rrd_dump);
+                       RETVAL = 1;
        OUTPUT:
-		RETVAL
+               RETVAL
 
+int
+rrd_restore(...)
+       PROTOTYPE: @
+       PREINIT:
+        int i;
+       char **argv;
+       CODE:
+               rrdcode(rrd_restore);
+                       RETVAL = 1;
+       OUTPUT:
+               RETVAL
 
+int
+rrd_flush(...)
+	PROTOTYPE: @
+	PREINIT:
+	int i;
+	char **argv;
+	CODE:
+		rrdcode(rrd_cmd_flush);
+	OUTPUT:
+		RETVAL