![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e917e42)
raw | patch | inline | side by side (parent: e917e42)
| author | alex <alex@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
| Sat, 29 Jun 2002 15:24:26 +0000 (15:24 +0000) | ||
| committer | alex <alex@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
| Sat, 29 Jun 2002 15:24:26 +0000 (15:24 +0000) |
Added a DEBUG prefix to all grapher commands
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@152 a5681a0c-68f1-0310-ab6d-d61299d08faa
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@152 a5681a0c-68f1-0310-ab6d-d61299d08faa
| src/rrd_graph.c | patch | blob | history | |
| src/rrd_graph.h | patch | blob | history | |
| src/rrd_graph_helper.c | patch | blob | history |
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index fdcee3120102130843787c30f5585107cb72c8c3..80c4d0ffc4da8f913ca9c779f46e020a4e45a398 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
#endif
#include "rrd_graph.h"
-#include "rrd_graph_helper.h"
/* some constant definitions */
#undef conv_if
-
-
int
im_free(image_desc_t *im)
{
- long i,ii;
+ unsigned long i,ii;
+
if (im == NULL) return 0;
- for(i=0;i<im->gdes_c;i++){
+ for(i=0;i<(unsigned)im->gdes_c;i++){
if (im->gdes[i].data_first){
/* careful here, because a single pointer can occur several times */
free (im->gdes[i].data);
if (!im->gdes[ii].stack)
paintval = 0.0;
case GF_STACK:
- /* The time of the data doesn't necessarily match
- ** the time of the graph. Beware.
- */
- vidx = im->gdes[ii].vidx;
- if ( (gr_time >= im->gdes[vidx].start) &&
+ value = im->gdes[ii].yrule;
+ if (isnan(value)) { /* not a number or VDEF */
+ /* The time of the data doesn't necessarily match
+ ** the time of the graph. Beware.
+ */
+ vidx = im->gdes[ii].vidx;
+ if ( (gr_time >= im->gdes[vidx].start) &&
(gr_time <= im->gdes[vidx].end) ) {
- value = im->gdes[vidx].data[
- (unsigned long) floor(
+ value = im->gdes[vidx].data[
+ (unsigned long) floor(
(double)(gr_time - im->gdes[vidx].start)
/ im->gdes[vidx].step)
- * im->gdes[vidx].ds_cnt
- + im->gdes[vidx].ds
- ];
- } else {
- value = DNAN;
- }
+ * im->gdes[vidx].ds_cnt
+ + im->gdes[vidx].ds
+ ];
+ } else {
+ value = DNAN;
+ }
+ };
if (! isnan(value)) {
paintval += value;
&& ! isnan(im->gdes[i].p_data[ii])){
if (node == NULL){
float ybase = 0.0;
+/*
if (im->gdes[i].gf == GF_STACK) {
+*/
+ if ( (im->gdes[i].gf == GF_STACK)
+ || (im->gdes[i].stack) ) {
+
ybase = ytr(im,lastgdes->p_data[ii-1]);
} else {
ybase = ytr(im,areazero);
if ( node != NULL && (ii+1==im->xsize || isnan(im->gdes[i].p_data[ii]) )){
/* GF_AREA STACK type*/
+/*
if (im->gdes[i].gf == GF_STACK ) {
+*/
+ if ( (im->gdes[i].gf == GF_STACK)
+ || (im->gdes[i].stack) ) {
int iii;
for (iii=ii-1;iii>area_start;iii--){
gfx_add_point(node,iii+im->xorigin,ytr(im,lastgdes->p_data[iii]));
im->gdes[im->gdes_c-1].step=def_step;
im->gdes[im->gdes_c-1].stack=0;
+ im->gdes[im->gdes_c-1].debug=0;
im->gdes[im->gdes_c-1].start=im->start;
im->gdes[im->gdes_c-1].end=im->end;
im->gdes[im->gdes_c-1].vname[0]='\0';
im->gdes[im->gdes_c-1].rrd[0]='\0';
im->gdes[im->gdes_c-1].ds=-1;
im->gdes[im->gdes_c-1].p_data=NULL;
+ im->gdes[im->gdes_c-1].yrule=DNAN;
+ im->gdes[im->gdes_c-1].xrule=0;
return 0;
}
rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize)
{
image_desc_t im;
-
-#ifdef HAVE_TZSET
- tzset();
-#endif
-#ifdef HAVE_SETLOCALE
- setlocale(LC_TIME,"");
-#endif
-
rrd_graph_init(&im);
rrd_graph_options(argc,argv,&im);
- if (rrd_test_error()) return -1;
+ if (rrd_test_error()) {
+ im_free(&im);
+ return -1;
+ }
if (strlen(argv[optind])>=MAXPATH) {
rrd_set_error("filename (including path) too long");
+ im_free(&im);
return -1;
}
strncpy(im.graphfile,argv[optind],MAXPATH-1);
im.graphfile[MAXPATH-1]='\0';
rrd_graph_script(argc,argv,&im);
- if (rrd_test_error()) return -1;
+ if (rrd_test_error()) {
+ im_free(&im);
+ return -1;
+ }
/* Everything is now read and the actual work can start */
{
int i;
+#ifdef HAVE_TZSET
+ tzset();
+#endif
+#ifdef HAVE_SETLOCALE
+ setlocale(LC_TIME,"");
+#endif
+
im->xlab_user.minsec = -1;
im->ximg=0;
im->yimg=0;
im->end = end_tmp;
}
-/* rrd_name_or_num()
-**
-** Scans for a VDEF-variable or a number
-**
-** Returns an integer describing what was found:
-**
-** 0: error
-** 1: found an integer; it is returned in both l and d
-** 2: found a float; it is returned in d
-** 3: found a vname; its index is returned in l
-**
-** l and d are undefined unless described above
-*/
-static int
-rrd_name_or_num(image_desc_t *im, char *param, long *l, double *d)
-{
- int i1=0,i2=0,i3=0,i4=0,i5=0,i6=0;
- char vname[MAX_VNAME_LEN+1];
-
- sscanf(param, "%li%n%*s%n", l,&i1,&i2);
- sscanf(param, "%lf%n%*s%n", d,&i3,&i4);
- sscanf(param, DEF_NAM_FMT "%n%*s%n", vname, &i5,&i6);
-
- if ( (i1) && (!i2) ) return 1;
- if ( (i3) && (!i4) ) return 2;
- if ( (i5) && (!i6) ) {
- if ((*l = find_var(im,vname))!=-1) return 3;
- }
- return 0;
-}
-
-/* rrd_vname_color()
-**
-** Parses "[<vname|number>][#color]" where at least one
-** of the optional strings must exist.
-**
-** Returns an integer describing what was found.
-** If the result is 0, the rrd_error string may be set.
-**
-** ...CVVVV
-** ---------:-----------------------------------
-** 00000000 : error
-** ....0000 : a value/variable was not found
-** ....0001 : an integer number was found, returned in both l and d
-** ....0010 : a floating point number was found, returned in d
-** ....0011 : reserved for future values
-** ....01xx : reserved for future values
-** ....1000 : an existing DEF vname was found, idx returned in l
-** ....1001 : an existing CDEF vname was found, idx returned in l
-** ....1010 : an existing VDEF vname was found, idx returned in l
-** ....1011 : reserved for future variables
-** ....11xx : reserved for future variables
-** ...0.... : a color was not found, returned in color
-** ...1.... : a color was found, returned in color
-*/
-static int
-rrd_vname_color(image_desc_t *im, char * param,
- long *l,
- double *d,
- gfx_color_t *color)
-{
- int result=0,i=0;
-
- if (param[0]!='#') { /* vname or num present, or empty string */
- char *s,*c=param;
- while ((*c!='\0')&&(*c!='#')) c++,i++;
- if (*c!='\0') {
- s=malloc(i+1);
- if (s==NULL) {
- rrd_set_error("Out of memory in function rrd_vname_color");
- return 0;
- }
- strncpy(s,param,i);
- s[i]='\0';
- result=rrd_name_or_num(im, s, l, d);
- if (!result) {
- rrd_set_error("Use of uninitialized vname %s",s);
- free(s);
- }
- } else {
- result=rrd_name_or_num(im, param, l, d);
- if (!result) {
- rrd_set_error("Use of uninitialized vname %s",param);
- }
- }
- switch (result) {
- case 0: return 0; /* error set above */
- case 1:
- case 2: break;
- case 3:
- switch (im->gdes[*l].gf) {
- case GF_DEF: result=0x08;break;
- case GF_CDEF: result=0x09;break;
- case GF_VDEF: result=0x0A;break;
- default:
- rrd_set_error("Unexpected GF result from function "
- "rrd_name_or_num() called from rrd_vname_color");
- return 0;
- }
- break;
- default:
- rrd_set_error("Unexpected result from function "
- "rrd_name_or_num() called from rrd_vname_color");
- return 0;
- }
- }
- /* Parse color, if any. */
- if (param[i] == '\0') return result;
- else {
- unsigned int r=0,g=0,b=0,a=0xFF;
- int i1=0,i2=0;
- sscanf(¶m[i], "#%02x%02x%02x%n%02x%n",
- &r,&g,&b,&i1,&a,&i2);
- if (!i1) {
- rrd_set_error("Unparsable color %s",¶m[i]);
- return 0;
- }
- if (i2) i1=i2;
- i2=0;
- sscanf(¶m[i+i1],"%*s%n",&i2);
- if (i2) {
- rrd_set_error("Garbage after color %s",param[i]);
- return 0;
- }
- *color=r<<24|g<<16|b<<8|a;
- return result|0x10;
- }
-}
-
-/* rrd_find_function()
-**
-** Checks if the parameter is a valid function and
-** if so, returns it in the graph description pointer.
-**
-** The return value is a boolean; true if found
-*/
-static int
-rrd_find_function(char *param, graph_desc_t *gdp)
-{
- size_t i1=0,i2=0;
- char funcname[11];
-
- sscanf(param,"%10[A-Z]%n%*1[1-3]%n",funcname,(int *)&i1,(int *)&i2);
- gdp->gf=gf_conv(funcname);
- if ((int)gdp->gf == -1) {
- rrd_set_error("'%s' is not a valid function name",funcname);
- return 0;
- }
- if (gdp->gf==GF_LINE) {
- if (i2) {
- gdp->linewidth=param[i1]-'0';
- } else {
- rrd_set_error("LINE should have a width");
- return 0;
- }
- } else {
- if (i2) {
- rrd_set_error("Only LINE should have a width: %s",param);
- return 0;
- } else {
- i2=i1;
- }
- }
- if (strlen(param) != i2) {
- rrd_set_error("Garbage after function name: %s",param);
- return 0;
- }
- return 1;
-}
-/* rrd_split_line()
-**
-** Takes a string as input; splits this line into multiple
-** parameters on each ":" boundary.
-**
-** If this function returns successful, the caller will have
-** to free() the allocated memory for param.
-**
-** The input string is destroyed, its memory is used by the
-** output array.
-*/
-static int
-rrd_split_line(char *line,char ***param)
-{
- int i=0,n=0,quoted=0;
- char *src=line;
- char *dst=line;
-
- /* scan the amount of colons in the line. We need
- ** at most this amount+1 pointers for the array. If
- ** any colons are escaped we waste some space.
- */
- if (*src!='\0') n=1;
-
- while (*src != '\0')
- if (*src++ == ':') n++;
-
- if (n==0) {
- rrd_set_error("No line to split. rrd_split_line was given the empty string.");
- return -1;
- }
-
- src = line;
-
- /* Allocate memory for an array of n char pointers */
- *param=calloc(n,sizeof(char *));
- if (*param==NULL) {
- rrd_set_error("Memory allocation failed inside rrd_split_line");
- return -1;
- }
-
- /* split the line and fill the array */
-
- i=0;
- (*param)[i] = dst;
- while (*src != '\0') {
- switch (*src) {
- case '\'':
- quoted^=1;
- src++;
- break;
- case '\\': /* could be \: but also \n */
- src++;
- switch (*src) {
- case '\0':
- free(*param);
- rrd_set_error("Lone backslash inside rrd_split_line");
- return -1;
- case ':':
- *dst++=*src++;
- break;
- default:
- *dst++='\\';
- *dst++=*src++;
- }
- break;
- case ':':
- if (quoted) *dst++=*src++;
- else {
- *dst++ = '\0';
- src++;
- i++;
- (*param)[i] = dst;
- }
- break;
- default:
- *dst++=*src++;
- }
- }
- *dst='\0';
- i++; /* i separators means i+1 parameters */
-
- return i;
-}
-
-void
-rrd_graph_script_parse_def(int argc,char *argv[],int used,graph_desc_t *gdp) {
- time_t start_tmp=0,end_tmp=0;
- struct time_value start_tv, end_tv;
- char *parsetime_error = NULL;
- struct option long_options[] = {
- { "step", required_argument, NULL, 256 },
- { "start", required_argument, NULL, 's' },
- { "end", required_argument, NULL, 'e' },
- { NULL,0,NULL,0 }};
- int option_index = 0;
- int opt;
-
- opterr=0;
- optind=used;
-
- start_tv.type=ABSOLUTE_TIME;
- start_tv.offset=0;
- end_tv.type=ABSOLUTE_TIME;
- end_tv.offset=0;
- memcpy(&start_tv.tm, gmtime(&gdp->start) , sizeof(struct tm) );
- memcpy(&end_tv.tm, gmtime(&gdp->end) , sizeof(struct tm) );
-
- while (1) {
- opt = getopt_long(argc,argv,"-s:e:", long_options,&option_index);
- if (opt==-1) break;
- switch (opt) {
- case 1:
- printf("DEBUG: found non-option[%i] %s\n",optind,optarg);
- break;
- case 's':
- if ((parsetime_error = parsetime(optarg, &start_tv))) {
- rrd_set_error( "DEF start time: %s", parsetime_error );
- return;
- }
- break;
- case 'e':
- if ((parsetime_error = parsetime(optarg, &end_tv))) {
- rrd_set_error( "DEF end time: %s", parsetime_error );
- return;
- }
- break;
- case 256:
- gdp->step = atol(optarg);
- break;
- case '?':
- printf("DEBUG: unrecognized option %s\n",argv[optind]);
- break;
- case ':':
- printf("DEBUG: option %c needs parameter\n",optopt);
- break;
- default:
- printf("DEBUG: getopt returned unknown char %c\n",opt);
- break;
- }
- }
- if (optind < argc) {
- printf("DEBUG: %i remaining parameters:\n",argc-optind);
- while (optind<argc)
- printf("DEBUG: %3i: %s\n",optind,argv[optind++]);
- printf("\n");
- }
-
- if (proc_start_end(&start_tv,&end_tv,&start_tmp,&end_tmp) == -1){
- /* error string is set in parsetime.c */
- return;
- }
-
- if (start_tmp < 3600*24*365*10){
- rrd_set_error("the first entry to fetch should be after 1980 (%ld)",start_tmp);
- return;
- }
-
- if (end_tmp < start_tmp) {
- rrd_set_error("start (%ld) should be less than end (%ld)",
- start_tmp, end_tmp);
- return;
- }
-
- gdp->start = start_tmp;
- gdp->end = end_tmp;
-}
-
-void
-rrd_graph_script(int argc, char *argv[], image_desc_t *im)
-{
- int i;
- char symname[100];
- int linepass = 0; /* stack must follow LINE*, AREA or STACK */
- char ** param;
- int paramcnt,paramused;
-
- for (i=optind+1;i<argc;i++) {
- int argstart=0;
- int strstart=0;
- graph_desc_t *gdp;
- char *line;
- char tmpline[256];
- char vname[MAX_VNAME_LEN+1],sep[1];
-/* double d; */
- int j,k,l/*,m*/;
-
- /* Each command is one element from *argv[]. This command is
- ** split at every unescaped colon.
- **
- ** Each command defines the most current gdes inside struct im.
- ** In stead of typing "im->gdes[im->gdes_c-1]" we use "gdp".
- */
- gdes_alloc(im);
- gdp=&im->gdes[im->gdes_c-1];
- strcpy(tmpline,argv[i]);
- line=tmpline;
- if ((paramcnt=rrd_split_line(argv[i],¶m))==-1) return;
- paramused=0;
-
-#ifdef DEBUG
- printf("DEBUG: after splitting line:\n");
- for (j=0;j<paramcnt;j++)
- printf("DEBUG: %3i: %s\n",j,param[j]);
-#endif
-
- if (!rrd_find_function(param[paramused],gdp)) {
- im_free(im);
- free(param);
- return;
- }
- paramused++;
-
- /* function:newvname=string[:ds-name:CF] for xDEF
- ** function:vname[#color[:string]] for LINEx,AREA,STACK
- ** function:vname#color[:num[:string]] for TICK
- ** function:vname-or-num#color[:string] for xRULE,PART
- ** function:vname:CF:string for xPRINT
- ** function:string for COMMENT
- */
-
-/*TEMP*/argstart=strlen(param[paramused-1])+1;
-
- /* If anything fails just use rrd_set_error() and break from the
- ** switch. Just after the switch we call rrd_test_error() and
- ** clean up if it is set.
- */
- switch (gdp->gf) {
- case GF_XPORT:
- break;
- case GF_COMMENT:
- if (paramcnt<2) {
- rrd_set_error("Not enough parameters for %s",param[0]);
- break;
- }
- if (strlen(param[1])>FMT_LEG_LEN) {
- rrd_set_error("Comment too long: %s:%s",param[0],param[1]);
- break;
- }
- strcpy(gdp->legend,param[1]);
- paramused++;
- break;
- case GF_PART:
- case GF_VRULE:
- case GF_HRULE:
- if (paramcnt<2) {
- rrd_set_error("No name or number in %s",param[0]);
- break;
- }
- j=rrd_vname_color(im,param[1],
- &gdp->xrule,&gdp->yrule,&gdp->col);
- paramused++;
- if (!j) break; /* error string set by function */
- switch (j&0x0F) {
- case 0x00:
- rrd_set_error("Cannot parse name nor number "
- "in %s:%s",param[0],param[1]);
- break;
- case 0x08:
- case 0x09:
- rrd_set_error("Cannot use DEF or CDEF based "
- "variable in %s:%s",param[0],param[1]);
- break;
- case 0x0A:
- gdp->vidx=gdp->xrule;
- gdp->xrule=0;
- gdp->yrule=DNAN;
- break;
- case 0x01:
- case 0x02:
- break;
- default:
- rrd_set_error("Unexpected result while parsing "
- "%s:%s, program error",param[0],param[1]);
- }
- if (rrd_test_error()) break;
-
- if (paramcnt>paramused) {
- if (strlen(param[paramused])>FMT_LEG_LEN) {
- rrd_set_error("Comment too long: %s:%s",
- param[0],param[1]);
- break;
- }
- strcpy(gdp->legend,param[paramused]);
- paramused++;
- }
- break;
- case GF_STACK:
- if (linepass==0) {
- rrd_set_error("STACK must follow another graphing element");
- break;
- }
- case GF_LINE:
- case GF_AREA:
- case GF_TICK:
- /* LINEx:vname[#color[:legend]][:STACK]
- ** AREA:vname[#color[:legend]][:STACK]
- ** STACK:vname[#color[:legend]]
- ** TICK:vname#color[:num[:legend]]
- */
- linepass=1;
- j=rrd_vname_color(im,param[paramused++],
- &gdp->vidx,&gdp->yrule,&gdp->col);
- if (!j) break; /* error string set by function */
- switch (j&0x0F) {
- case 0x00:
- rrd_set_error("Cannot parse name nor number "
- "in %s:%s",param[0],param[1]);
- break;
- case 0x01:
- case 0x02:
- rrd_set_error("Cannot %s a number",param[0]);
- break;
- case 0x08:
- case 0x09:
- break;
- case 0x0A:
- rrd_set_error("Cannot use VDEF based variable "
- "with %s %s",param[0],gdp->vname);
- break;
- }
- if (rrd_test_error()) break;
-
- if (gdp->gf == GF_TICK) {
- if (!(j&0x10)) {
- rrd_set_error("Color not optional for TICK");
- break;
- } else { /* parse optional number */
- k=l=0;
- sscanf(param[paramused], "%lf%n%*s%n",
- &gdp->yrule,&k,&l);
- if ((k!=0)&&(l==0)) paramused++;
- if (paramused<paramcnt)
- strcpy(gdp->legend,param[paramused++]);
- }
- } else {
- if (j&0x10) { /* color present */
- /* next should be legend or STACK. If it
- ** is STACK then leave it at is, else parse
- ** the legend (if any)
- */
- if (paramused<paramcnt)
- if (strcmp("STACK",param[paramused]))
- strcpy(gdp->legend,param[paramused++]);
- }
- if (paramused<paramcnt)
- if (!strcmp("STACK",param[paramused])) {
- gdp->stack=1;
- paramused++;
- }
- }
- break;
- case GF_PRINT:
- im->prt_c++;
- case GF_GPRINT:
- j=0;
- sscanf(&line[argstart], DEF_NAM_FMT ":%n",gdp->vname,&j);
- if (j==0) {
- rrd_set_error("Cannot parse vname in line: '%s'",line);
- break;
- }
- argstart+=j;
- if (rrd_graph_check_vname(im,gdp->vname,line)) return;
- j=0;
- sscanf(&line[argstart], CF_NAM_FMT ":%n",symname,&j);
-
- k=(j!=0)?rrd_graph_check_CF(im,symname,line):1;
-#define VIDX im->gdes[gdp->vidx]
- switch (k) {
- case -1: /* looks CF but is not really CF */
- if (VIDX.gf == GF_VDEF) rrd_clear_error();
- break;
- case 0: /* CF present and correct */
- if (VIDX.gf == GF_VDEF)
- rrd_set_error("Don't use CF when printing VDEF");
- argstart+=j;
- break;
- case 1: /* CF not present */
- if (VIDX.gf == GF_VDEF) rrd_clear_error();
- else rrd_set_error("Printing DEF or CDEF needs CF");
- break;
- default:
- rrd_set_error("Oops, bug in GPRINT scanning");
- }
-#undef VIDX
- if (rrd_test_error()) break;
-
- if (strlen(&line[argstart])!=0) {
- if (rrd_graph_legend(gdp,&line[argstart])==0)
- rrd_set_error("Cannot parse legend in line: %s",line);
- } else rrd_set_error("No legend in (G)PRINT line: %s",line);
- strcpy(gdp->format, gdp->legend);
- break;
- case GF_DEF:
- case GF_VDEF:
- case GF_CDEF:
- j=0;
- if (paramcnt<2) {
- rrd_set_error("Nothing following %s",param[0]);
- break;
- }
- sscanf(param[1], DEF_NAM_FMT "=%n",gdp->vname,&j);
- if (j==0) {
- rrd_set_error("Could not parse %s:%s",param[0],param[1]);
- break;
- }
- if (find_var(im,gdp->vname)!=-1) {
- rrd_set_error("Variable '%s' in %s:%s' already in use\n",
- gdp->vname,param[0],param[1]);
- break;
- }
- paramused++;
- argstart+=j; /* parsed upto and including "xDEF:vname=" */
- switch (gdp->gf) {
- case GF_DEF:
- if (strlen(¶m[1][j])>MAXPATH) {
- rrd_set_error("Path too long: %s:%s",param[0],param[1]);
- break;
- }
- strcpy(gdp->rrd,¶m[1][j]);
-
- if (paramcnt<3) {
- rrd_set_error("No DS for %s:%s",param[0],param[1]);
- break;
- }
- j=k=0;
- sscanf(param[2],DS_NAM_FMT "%n%*s%n",gdp->ds_nam,&j,&k);
- if ((j==0)||(k!=0)) {
- rrd_set_error("Cannot parse DS in %s:%s:%s",
- param[0],param[1],param[2]);
- break;
- }
- paramused++;
- if (paramcnt<4) {
- rrd_set_error("No CF for %s:%s:%s",
- param[0],param[1],param[2]);
- break;
- }
- j=k=0;
- sscanf(param[3],CF_NAM_FMT "%n%*s%n",symname,&j,&k);
- if ((j==0)||(k!=0)) {
- rrd_set_error("Cannot parse CF in %s:%s:%s:%s",
- param[0],param[1],param[2],param[3]);
- break;
- }
- if ((gdp->cf = cf_conv(symname))==-1) {
- rrd_set_error("Unknown CF '%s' in %s:%s:%s:%s",
- param[0],param[1],param[2],param[3]);
- break;
- }
- paramused++;
- if (paramcnt>paramused) { /* optional parameters */
-rrd_graph_script_parse_def(paramcnt,param,paramused,gdp);
- if (rrd_test_error()) break;
- }
- break;
- case GF_VDEF:
- k=0;
- sscanf(¶m[1][j],DEF_NAM_FMT ",%n",vname,&k);
- if (k==0) {
- rrd_set_error("Cannot parse vname: %s:%s",
- param[0],param[1]);
- break;
- }
- j+=k;
- if (rrd_graph_check_vname(im,vname,line)) return;
- if ( im->gdes[gdp->vidx].gf != GF_DEF
- && im->gdes[gdp->vidx].gf != GF_CDEF) {
- rrd_set_error("variable '%s' not DEF nor "
- "CDEF in VDEF '%s'", vname,gdp->vname);
- break;
- }
- vdef_parse(gdp,¶m[1][j]);
- break;
- case GF_CDEF:
- if ((gdp->rpnp = rpn_parse(
- (void *)im,
- ¶m[1][j],
- &find_var_wrapper)
- )==NULL)
- rrd_set_error("invalid rpn expression in: %s",param[1]);
- break;
- default: break;
- }
- break;
- default: rrd_set_error("Big oops");
- }
- if (rrd_test_error()) {
- im_free(im);
- return;
- }
- }
-
- if (im->gdes_c==0){
- rrd_set_error("can't make a graph without contents");
- im_free(im); /* ??? is this set ??? */
- return;
- }
-}
-
int
rrd_graph_check_vname(image_desc_t *im, char *varname, char *err)
{
}
}
int
-rrd_graph_check_CF(image_desc_t *im, char *symname, char *err)
-{
- if ((im->gdes[im->gdes_c-1].cf=cf_conv(symname))==-1) {
- rrd_set_error("Unknown CF '%s' in %s",symname,err);
- return -1;
- }
- return 0;
-}
-int
rrd_graph_legend(graph_desc_t *gdp, char *line)
{
int i;
diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 4c898e06840b8a2ec542a5e31dbc72ab5be2df59..fa5e7ceac0135fac2f16e24b731346f525b593ba 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
typedef struct graph_desc_t {
enum gf_en gf; /* graphing function */
int stack; /* boolean */
+ int debug; /* boolean */
char vname[MAX_VNAME_LEN+1]; /* name of the variable */
long vidx; /* gdes reference */
char rrd[255]; /* name of the rrd_file containing data */
void rrd_graph_options(int, char **, image_desc_t *);
void rrd_graph_script(int, char **, image_desc_t *);
int rrd_graph_check_vname(image_desc_t *, char *, char *);
-int rrd_graph_check_CF(image_desc_t *, char *, char *);
int rrd_graph_color(image_desc_t *, char *, char *, int);
int rrd_graph_legend(graph_desc_t *, char *);
int bad_format(char *);
diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index d325bf0ae538f6dd45799a2804b65bcc8abdbc3d..bea9d7b6c06ad711ba0aab6d849696f3d3ccd2dc 100644 (file)
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
-/**********************************************************
- *** Several generic helper functions for rrd_graph.c ***
- **********************************************************/
-
#include "rrd_graph.h"
-#include "rrd_graph_helper.h"
-
-/**********************************************************
- *** Helper functions for parsing command file ***
- **********************************************************/
-
-/* Parse a VNAME followed by an equal sign ( CDEF:VNAME= )
- *
- * Input: pointer to argv
- * Input: pointer to im structure
- * Input: pointer to error string
- * Output: number of chars eaten (0 means error)
- *
- * Usage: n=parse_vname( &argv[i][argstart],&im, "VDEF");
- * if (n==0) { error } else { argstart+=n };
- */
+
+#define dprintf if (gdp->debug) printf
+
int
-parse_vname1(cptr,im,err)
-char * cptr;
-image_desc_t * im;
-char * err;
-{
- int n=0,vidx;
-
- sscanf(cptr, DEF_NAM_FMT "=%n",im->gdes[im->gdes_c-1].vname,&n);
-
- /* Check if the sequence matches, including the
- * terminating equal sign */
- if (n==0) {
- im_free(im);
- rrd_set_error("Can't parse VNAME in %s: '%s'",err,cptr);
- return 0;
+rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) {
+ char funcname[11],c1=0,c2=0;
+ int i=0;
+
+ sscanf(&line[*eaten], "DEBUG%n", &i);
+ if (i) {
+ gdp->debug=1;
+ (*eaten)+=i;
+ i=0;
+ dprintf("Scanning line '%s'\n",&line[*eaten]);
+ }
+ sscanf(&line[*eaten], "%10[A-Z]%n%c%c", funcname, &i, &c1, &c2);
+ if (!i) {
+ rrd_set_error("Could not make sense out of '%s'",line);
+ return 1;
+ }
+ if ((int)(gdp->gf=gf_conv(funcname)) == -1) {
+ rrd_set_error("'%s' is not a valid function name", funcname);
+ return 1;
}
+ if (gdp->gf == GF_LINE) {
+ if (c1 < '1' || c1 > '3' || c2 != ':') {
+ rrd_set_error("Malformed LINE command: %s",line);
+ return 1;
+ }
+ gdp->linewidth=c1-'0';
+ i++;
+ } else {
+ if (c1 != ':') {
+ rrd_set_error("Malformed %s command: %s",funcname,line);
+ return 1;
+ }
+ }
+ *eaten+=++i;
+ return 0;
+}
- /* Check if this is an unused variable */
- vidx=find_var(im,im->gdes[im->gdes_c-1].vname);
- if (vidx!=-1) {
- switch(im->gdes[vidx].gf) {
- case GF_DEF:
- rrd_set_error("Duplicate variable in %s: '%s' defined as DEF",
- err,im->gdes[im->gdes_c-1].vname);
- break;
- case GF_CDEF:
- rrd_set_error("Duplicate variable in %s: '%s' defined as CDEF",
- err,im->gdes[im->gdes_c-1].vname);
- break;
- case GF_VDEF:
- rrd_set_error("Duplicate variable in %s: '%s' defined as VDEF",
- err,im->gdes[im->gdes_c-1].vname);
- break;
- default:
- rrd_set_error("Duplicate variable in %s: '%s' defined",
- err,im->gdes[im->gdes_c-1].vname);
- break;
- };
- im_free(im);
+int
+rrd_parse_legend(char *line, unsigned int *eaten, graph_desc_t *gdp) {
+ int i;
+
+ dprintf("- examining '%s'\n",&line[*eaten]);
+
+ i=scan_for_col(&line[*eaten],FMT_LEG_LEN,gdp->legend);
+
+ *eaten += i;
+ if (line[*eaten]!='\0' && line[*eaten]!=':') {
+ rrd_set_error("Legend too long");
+ return 1;
+ } else {
+ dprintf("- found legend '%s'\n", gdp->legend);
return 0;
}
+}
+
+int
+rrd_parse_color(char *string, graph_desc_t *gdp) {
+ unsigned int r=0,g=0,b=0,a=0;
+ int i1=0,i2=0,i3=0;
+
+ if (string[0] != '#') return 1;
+ sscanf(string, "#%02x%02x%02x%n%02x%n%*s%n",
+ &r,&g,&b,&i1,&a,&i2,&i3);
+
+ if (i3) return 1; /* garbage after color */
+ if (!i2) a=0xFF;
+ if (!i1) return 1; /* no color after '#' */
+ gdp->col = r<<24|g<<16|b<<8|a;
+ return 0;
+}
+
+int
+rrd_parse_CF(char *line, unsigned int *eaten, graph_desc_t *gdp) {
+ char symname[CF_NAM_SIZE];
+ int i=0;
+
+ sscanf(&line[*eaten], CF_NAM_FMT "%n", symname,&i);
+ if ((!i)||((line[*eaten+i]!='\0')&&(line[*eaten+i]!=':'))) {
+ rrd_set_error("Cannot parse CF in '%s'",line);
+ return 1;
+ }
+ (*eaten)+=i;
+ dprintf("- using CF '%s'\n",symname);
- /* VNAME must start with a character other than numeric */
- if (isdigit(im->gdes[im->gdes_c-1].vname[0])) {
- rrd_set_error("Variable in %s starts with a digit: '%s'",
- err,im->gdes[im->gdes_c-1].vname);
- im_free(im);
+ if ((int)(gdp->cf = cf_conv(symname))==-1) {
+ rrd_set_error("Unknown CF '%s' in '%s'",symname,line);
+ return 1;
+ }
+
+ if (line[*eaten]!='\0') (*eaten)++;
+ return 0;
+}
+
+/* Parsing old-style xPRINT and new-style xPRINT */
+int
+rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+ /* vname:CF:format in case of DEF-based vname
+ ** vname:CF:format in case of CDEF-based vname
+ ** vname:format in case of VDEF-based vname
+ */
+ char tmpstr[MAX_VNAME_LEN+1];
+ int i=0;
+
+ sscanf(&line[*eaten], DEF_NAM_FMT ":%n", tmpstr,&i);
+ if (!i) {
+ rrd_set_error("Could not parse line '%s'",line);
+ return 1;
+ }
+ (*eaten)+=i;
+ dprintf("- Found candidate vname '%s'\n",tmpstr);
+
+ if ((gdp->vidx=find_var(im,tmpstr))<0) {
+ rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
+ return 1;
+ }
+ switch (im->gdes[gdp->vidx].gf) {
+ case GF_DEF:
+ case GF_CDEF:
+ dprintf("- vname is of type DEF or CDEF, looking for CF\n");
+ if (rrd_parse_CF(line,eaten,gdp)) return 1;
+ break;
+ case GF_VDEF:
+ dprintf("- vname is of type VDEF\n");
+ break;
+ default:
+ rrd_set_error("Encountered unknown type variable '%s'",tmpstr);
+ return 1;
+ }
+
+ if (rrd_parse_legend(line,eaten,gdp)) return 1;
+
+ /* Why is there a separate structure member "format" ??? */
+ strcpy(gdp->format,gdp->legend);
+
+ return 0;
+}
+
+/* Parsing of PART, VRULE, HRULE, LINE, AREA, STACK and TICK
+** is done in one function. Stacking STACK is silently ignored
+** as it is redundant. Stacking PART, VRULE, HRULE or TICK is
+** not allowed. The check for color doesn't need to be so strict
+** anymore, the user can specify the color '#00000000' and
+** effectively circumvent this check, so why bother.
+**
+** If a number (which is valid to enter) is more than a
+** certain amount of characters, it is caught as an error.
+** While this is arguable, so is entering fixed numbers
+** with more than MAX_VNAME_LEN significant digits.
+*/
+int
+rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+ int i,j;
+ int colorfound=0;
+ char tmpstr[MAX_VNAME_LEN + 10]; /* vname#RRGGBBAA\0 */
+
+ dprintf("- parsing '%s'\n",&line[*eaten]);
+ dprintf("- from line '%s'\n",line);
+
+ i=scan_for_col(&line[*eaten],MAX_VNAME_LEN+9,tmpstr);
+ if (line[*eaten+i]!='\0' && line[*eaten+i]!=':') {
+ rrd_set_error("Cannot parse line '%s'",line);
+ return 1;
+ }
+
+ j=i; while (j>0 && tmpstr[j]!='#') j--;
+
+ if (tmpstr[j]=='#') {
+ if (rrd_parse_color(&tmpstr[j],gdp)) {
+ rrd_set_error("Could not parse color in '%s'",tmpstr[j]);
+ return 1;
+ }
+ tmpstr[j]='\0';
+ dprintf("- parsed color 0x%08x\n",(unsigned int)gdp->col);
+ colorfound=1;
+ }
+
+ dprintf("- examining '%s'\n",tmpstr);
+ j=0;
+ if (gdp->gf == GF_VRULE) {
+ sscanf(tmpstr,"%li%n",&gdp->xrule,&j);
+ if (j) dprintf("- found time: %li\n",gdp->xrule);
+ } else {
+ sscanf(tmpstr,"%lf%n",&gdp->yrule,&j);
+ if (j) dprintf("- found number: %f\n",gdp->yrule);
+ }
+ if (!j) {
+ if ((gdp->vidx=find_var(im,tmpstr))<0) {
+ rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
+ return 1;
+ }
+ dprintf("- found vname: '%s' vidx %li\n",tmpstr,gdp->vidx);
+ }
+ /* "*eaten" is still pointing to the original location,
+ ** "*eaten +i" is pointing to the character after the color
+ ** or to the terminating '\0' in which case we're finished.
+ */
+ if (line[*eaten+i]=='\0') {
+ *eaten+=i;
return 0;
- };
+ }
+ *eaten+=++i;
+
+ /* If a color is specified and the only remaining part is
+ ** ":STACK" then it is assumed to be the legend. An empty
+ ** legend can be specified as expected. This means the
+ ** following can be done: LINE1:x#FF0000FF::STACK
+ */
+ if (colorfound) { /* no legend if no color */
+ if (gdp->gf == GF_TICK) {
+ dprintf("- looking for optional number\n");
+ sscanf(&line[*eaten],"%lf:%n",&gdp->yrule,&j);
+ if (j) {
+ dprintf("- found number %f\n",gdp->yrule);
+ (*eaten)+=j;
+ if (gdp->yrule > 1.0 || gdp->yrule < -1.0) {
+ rrd_set_error("Tick factor should be <= 1.0");
+ return 1;
+ }
+ } else {
+ dprintf("- not found, defaulting to 0.1\n");
+ gdp->yrule=0.1;
+ return 0;
+ }
+ }
+ dprintf("- looking for optional legend\n");
+ dprintf("- in '%s'\n",&line[*eaten]);
+ if (rrd_parse_legend(line, eaten, gdp)) return 1;
+ }
+
+ /* PART, HRULE, VRULE and TICK cannot be stacked. We're finished */
+ if ( (gdp->gf == GF_HRULE)
+ || (gdp->gf == GF_VRULE)
+ || (gdp->gf == GF_PART)
+ || (gdp->gf == GF_TICK)
+ ) return 0;
+
+ if (line[*eaten]!='\0') {
+ dprintf("- still more, should be STACK\n");
+ (*eaten)++;
+ j=scan_for_col(&line[*eaten],5,tmpstr);
+ if (line[*eaten+j]!='\0') {
+ rrd_set_error("Garbage found where STACK expected");
+ return 1;
+ }
+ if (!strcmp("STACK",tmpstr)) {
+ dprintf("- found STACK\n");
+ gdp->stack=1;
+ (*eaten)+=5;
+ } else {
+ rrd_set_error("Garbage found where STACK expected");
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+int
+rrd_parse_vname(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+ char tmpstr[MAX_VNAME_LEN + 10];
+ int i=0;
- /* Reserved words checking. Not at the moment. */
+ sscanf(&line[*eaten], DEF_NAM_FMT "=%n", tmpstr,&i);
+ if (!i) {
+ rrd_set_error("Cannot parse vname from '%s'",line);
+ return 1;
+ }
+ dprintf("- found candidate '%s'\n",tmpstr);
- return n;
+ if ((gdp->vidx=find_var(im,tmpstr))>=0) {
+ rrd_set_error("Attempting to reuse '%s'",im->gdes[gdp->vidx].vname);
+ return 1;
+ }
+ strcpy(gdp->vname,tmpstr);
+ dprintf("- created vname '%s' vidx %lu\n", gdp->vname,im->gdes_c-1);
+ (*eaten)+=i;
+ return 0;
}
-/**********************************************************
- *** ***
- **********************************************************/
+int
+rrd_parse_def(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+ int i=0;
+ char command[6]; /* step, start, end */
+ char tmpstr[256];
+ struct time_value start_tv,end_tv;
+ time_t start_tmp=0,end_tmp=0;
+ char *parsetime_error=NULL;
+
+ start_tv.type = end_tv.type=ABSOLUTE_TIME;
+ start_tv.offset = end_tv.offset=0;
+ memcpy(&start_tv.tm, localtime(&gdp->start) , sizeof(struct tm) );
+ memcpy(&end_tv.tm, localtime(&gdp->end) , sizeof(struct tm) );
+
+ dprintf("- parsing '%s'\n",&line[*eaten]);
+ dprintf("- from line '%s'\n",line);
+
+ if (rrd_parse_vname(line,eaten,gdp,im)) return 1;
+ i=scan_for_col(&line[*eaten],254,gdp->rrd);
+ if (line[*eaten+i]!=':') {
+ rrd_set_error("Problems reading database name");
+ return 1;
+ }
+ (*eaten)+=++i;
+ dprintf("- using file '%s'\n",gdp->rrd);
+
+ i=0;
+ sscanf(&line[*eaten], DS_NAM_FMT ":%n", gdp->ds_nam,&i);
+ if (!i) {
+ rrd_set_error("Cannot parse DS in '%s'",line);
+ return 1;
+ }
+ (*eaten)+=i;
+ dprintf("- using DS '%s'\n",gdp->ds_nam);
+
+ if (rrd_parse_CF(line,eaten,gdp)) return 1;
+
+ if (line[*eaten]=='\0') return 0;
+
+ while (1) {
+ dprintf("- optional parameter follows: %s\n", &line[*eaten]);
+ i=0;
+ sscanf(&line[*eaten], "%5[a-z]=%n", command, &i);
+ if (!i) {
+ rrd_set_error("Parse error in '%s'",line);
+ return 1;
+ }
+ (*eaten)+=i;
+ dprintf("- processing '%s'\n",command);
+ if (!strcmp("step",command)) {
+ i=0;
+ sscanf(&line[*eaten],"%lu%n",&gdp->step,&i);
+ (*eaten)+=i;
+ dprintf("- using step %lu\n",gdp->step);
+ } else if (!strcmp("start",command)) {
+ i=scan_for_col(&line[*eaten],255,tmpstr);
+ (*eaten)+=i;
+ if ((parsetime_error = parsetime(tmpstr, &start_tv))) {
+ rrd_set_error( "start time: %s", parsetime_error );
+ return 1;
+ }
+ dprintf("- done parsing: '%s'\n",&line[*eaten]);
+ } else if (!strcmp("end",command)) {
+ i=scan_for_col(&line[*eaten],255,tmpstr);
+ (*eaten)+=i;
+ if ((parsetime_error = parsetime(tmpstr, &end_tv))) {
+ rrd_set_error( "end time: %s", parsetime_error );
+ return 1;
+ }
+ dprintf("- done parsing: '%s'\n",&line[*eaten]);
+ } else {
+ rrd_set_error("Parse error in '%s'",line);
+ return 1;
+ }
+ if (line[*eaten]=='\0') break;
+ if (line[*eaten]!=':') {
+ dprintf("- Expected to see end of string but got '%s'\n",\
+ &line[*eaten]);
+ rrd_set_error("Parse error in '%s'",line);
+ return 1;
+ }
+ (*eaten)++;
+ }
+ if (proc_start_end(&start_tv,&end_tv,&start_tmp,&end_tmp) == -1){
+ /* error string is set in parsetime.c */
+ return 1;
+ }
+ if (start_tmp < 3600*24*365*10) {
+ rrd_set_error("the first entry to fetch should be "
+ "after 1980 (%ld)",start_tmp);
+ return 1;
+ }
+
+ if (end_tmp < start_tmp) {
+ rrd_set_error("start (%ld) should be less than end (%ld)",
+ start_tmp, end_tmp);
+ return 1;
+ }
+
+ gdp->start = start_tmp;
+ gdp->end = end_tmp;
+
+ dprintf("- start time %lu\n",gdp->start);
+ dprintf("- end time %lu\n",gdp->end);
+
+ return 0;
+}
+int
+rrd_parse_vdef(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+ char tmpstr[MAX_VNAME_LEN+1]; /* vname\0 */
+ int i=0;
+
+ dprintf("- parsing '%s'\n",&line[*eaten]);
+ if (rrd_parse_vname(line,eaten,gdp,im)) return 1;
+
+ sscanf(&line[*eaten], DEF_NAM_FMT ",%n", tmpstr,&i);
+ if (!i) {
+ rrd_set_error("Cannot parse line '%s'",line);
+ return 1;
+ }
+ if ((gdp->vidx=find_var(im,tmpstr))<0) {
+ rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
+ return 1;
+ }
+ if ( im->gdes[gdp->vidx].gf != GF_DEF
+ && im->gdes[gdp->vidx].gf != GF_CDEF) {
+ rrd_set_error("variable '%s' not DEF nor "
+ "CDEF in VDEF '%s'", tmpstr,gdp->vname);
+ return 1;
+ }
+ dprintf("- found vname: '%s' vidx %li\n",tmpstr,gdp->vidx);
+ (*eaten)+=i;
+
+ dprintf("- calling vdef_parse with param '%s'\n",&line[*eaten]);
+ vdef_parse(gdp,&line[*eaten]);
+ while (line[*eaten]!='\0'&&line[*eaten]!=':')
+ (*eaten)++;
+
+ return 0;
+}
+
+int
+rrd_parse_cdef(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+ dprintf("- parsing '%s'\n",&line[*eaten]);
+ if (rrd_parse_vname(line,eaten,gdp,im)) return 1;
+ if ((gdp->rpnp = rpn_parse(
+ (void *)im,
+ &line[*eaten],
+ &find_var_wrapper)
+ )==NULL) {
+ rrd_set_error("invalid rpn expression in: %s",&line[*eaten]);
+ return 1;
+ };
+ while (line[*eaten]!='\0'&&line[*eaten]!=':')
+ (*eaten)++;
+ return 0;
+}
+
+void
+rrd_graph_script(int argc, char *argv[], image_desc_t *im) {
+ int i;
+
+ for (i=optind+1;i<argc;i++) {
+ graph_desc_t *gdp;
+ unsigned int eaten=0;
+
+ if (gdes_alloc(im)) return; /* the error string is already set */
+ gdp = &im->gdes[im->gdes_c-1];
+#ifdef DEBUG
+ gdp->debug = 1;
+#endif
+
+ if (rrd_parse_find_gf(argv[i],&eaten,gdp)) return;
+
+ switch (gdp->gf) {
+#if 0
+ /* future command */
+ case GF_SHIFT: vname:value
+#endif
+ case GF_XPORT:
+ break;
+ case GF_PRINT: /* vname:CF:format -or- vname:format */
+ case GF_GPRINT: /* vname:CF:format -or- vname:format */
+ if (rrd_parse_print(argv[i],&eaten,gdp,im)) return;
+ break;
+ case GF_COMMENT: /* text */
+ if (rrd_parse_legend(argv[i],&eaten,gdp)) return;
+ break;
+ case GF_PART: /* value[#color[:legend]] */
+ case GF_VRULE: /* value#color[:legend] */
+ case GF_HRULE: /* value#color[:legend] */
+ case GF_LINE: /* vname-or-value[#color[:legend]][:STACK] */
+ case GF_AREA: /* vname-or-value[#color[:legend]][:STACK] */
+ case GF_STACK: /* vname-or-value[#color[:legend]] */
+ case GF_TICK: /* vname#color[:num[:legend]] */
+ if (rrd_parse_PVHLAST(argv[i],&eaten,gdp,im)) return;
+ break;
+ /* data acquisition */
+ case GF_DEF: /* vname=x:DS:CF:[:step=#][:start=#][:end=#] */
+ if (rrd_parse_def(argv[i],&eaten,gdp,im)) return;
+ break;
+ case GF_CDEF: /* vname=rpn-expression */
+ if (rrd_parse_cdef(argv[i],&eaten,gdp,im)) return;
+ break;
+ case GF_VDEF: /* vname=rpn-expression */
+ if (rrd_parse_vdef(argv[i],&eaten,gdp,im)) return;
+ break;
+ }
+ if (gdp->debug) {
+ dprintf("used %i out of %i chars\n",eaten,strlen(argv[i]));
+ dprintf("parsed line: '%s'\n",argv[i]);
+ dprintf("remaining: '%s'\n",&argv[i][eaten]);
+ if (eaten >= strlen(argv[i]))
+ dprintf("Command finished successfully\n");
+ }
+ if (eaten < strlen(argv[i])) {
+ rrd_set_error("Garbage '%s' after command:\n%s",
+ &argv[i][eaten],argv[i]);
+ return;
+ }
+ }
+}