X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph_helper.c;h=29bcb5d6122926b0a4df83325305ad7957d9f327;hb=5cbb7b068f19aa61d11ad526c0ac66d51ee20065;hp=bea9d7b6c06ad711ba0aab6d849696f3d3ccd2dc;hpb=8c07cbbcf8f7f653216a7245dcc05f929df44299;p=rrdtool.git diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c index bea9d7b..29bcb5d 100644 --- a/src/rrd_graph_helper.c +++ b/src/rrd_graph_helper.c @@ -2,6 +2,29 @@ #define dprintf if (gdp->debug) printf +/* Define prototypes for the parsing methods. + Inputs: + char *line - pointer to base of input source + unsigned int eaten - index to next input character (INPUT/OUTPUT) + graph_desc_t *gdp - pointer to a graph description + image_desc_t *im - pointer to an image description +*/ + +int rrd_parse_find_gf (char *, unsigned int *, graph_desc_t *); +int rrd_parse_legend (char *, unsigned int *, graph_desc_t *); +int rrd_parse_color (char *, graph_desc_t *); +int rrd_parse_CF (char *, unsigned int *, graph_desc_t *, enum cf_en *); +int rrd_parse_print (char *, unsigned int *, graph_desc_t *, image_desc_t *); +int rrd_parse_shift (char *, unsigned int *, graph_desc_t *, image_desc_t *); +int rrd_parse_xport (char *, unsigned int *, graph_desc_t *, image_desc_t *); +int rrd_parse_PVHLAST (char *, unsigned int *, graph_desc_t *, image_desc_t *); +int rrd_parse_vname (char *, unsigned int *, graph_desc_t *, image_desc_t *); +int rrd_parse_def (char *, unsigned int *, graph_desc_t *, image_desc_t *); +int rrd_parse_vdef (char *, unsigned int *, graph_desc_t *, image_desc_t *); +int rrd_parse_cdef (char *, unsigned int *, graph_desc_t *, image_desc_t *); + + + int rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) { char funcname[11],c1=0,c2=0; @@ -75,7 +98,7 @@ rrd_parse_color(char *string, graph_desc_t *gdp) { } int -rrd_parse_CF(char *line, unsigned int *eaten, graph_desc_t *gdp) { +rrd_parse_CF(char *line, unsigned int *eaten, graph_desc_t *gdp, enum cf_en *cf) { char symname[CF_NAM_SIZE]; int i=0; @@ -87,7 +110,7 @@ rrd_parse_CF(char *line, unsigned int *eaten, graph_desc_t *gdp) { (*eaten)+=i; dprintf("- using CF '%s'\n",symname); - if ((int)(gdp->cf = cf_conv(symname))==-1) { + if ((int)(*cf = cf_conv(symname))==-1) { rrd_set_error("Unknown CF '%s' in '%s'",symname,line); return 1; } @@ -122,7 +145,7 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t 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; + if (rrd_parse_CF(line,eaten,gdp,&gdp->cf)) return 1; break; case GF_VDEF: dprintf("- vname is of type VDEF\n"); @@ -140,6 +163,77 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t return 0; } +int +rrd_parse_shift(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) { + char *l = strdup(line + *eaten), *p; + int rc = 1; + + p = strchr(l, ','); + if (p == NULL) { + rrd_set_error("Invalid SHIFT syntax"); + goto out; + } + *p++ = '\0'; + + if ((gdp->vidx=find_var(im,l))<0) { + rrd_set_error("Not a valid vname: %s in line %s",l,line); + goto out; + } + + /* constant will parse; otherwise, must be VDEF reference */ + if (sscanf(p, "%ld", &gdp->shval) != 1) { + graph_desc_t *vdp; + + if ((gdp->shidx=find_var(im, p))<0) { + rrd_set_error("invalid offset vname: %s", p); + goto out; + } + + vdp = &im->gdes[gdp->shidx]; + if (vdp->gf != GF_VDEF) { + rrd_set_error("offset must specify value or VDEF"); + goto out; + } + } else { + gdp->shidx = -1; + } + + *eaten = strlen(line); + rc = 0; + + out: + free(l); + return rc; +} + +int +rrd_parse_xport(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) { + char *l = strdup(line + *eaten), *p; + int rc = 1; + + p = strchr(l, ':'); + if (p != NULL) + *p++ = '\0'; + else + p = ""; + + if ((gdp->vidx=find_var(im, l))==-1){ + rrd_set_error("unknown variable '%s'",l); + goto out; + } + + if (strlen(p) >= FMT_LEG_LEN) + *(p + FMT_LEG_LEN) = '\0'; + + strcpy(gdp->legend, p); + *eaten = strlen(line); + rc = 0; + + out: + free(l); + return rc; +} + /* 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 @@ -213,7 +307,7 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc 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); + sscanf(&line[*eaten],"%lf%n",&gdp->yrule,&j); if (j) { dprintf("- found number %f\n",gdp->yrule); (*eaten)+=j; @@ -221,6 +315,8 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc rrd_set_error("Tick factor should be <= 1.0"); return 1; } + if (line[*eaten] == ':') + (*eaten)++; } else { dprintf("- not found, defaulting to 0.1\n"); gdp->yrule=0.1; @@ -285,16 +381,16 @@ rrd_parse_vname(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t 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 command[7]; /* step, start, end, reduce */ char tmpstr[256]; - struct time_value start_tv,end_tv; + struct rrd_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) ); + localtime_r(&gdp->start, &start_tv.tm); + localtime_r(&gdp->end, &end_tv.tm); dprintf("- parsing '%s'\n",&line[*eaten]); dprintf("- from line '%s'\n",line); @@ -317,21 +413,26 @@ rrd_parse_def(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t * (*eaten)+=i; dprintf("- using DS '%s'\n",gdp->ds_nam); - if (rrd_parse_CF(line,eaten,gdp)) return 1; - + if (rrd_parse_CF(line,eaten,gdp,&gdp->cf)) return 1; + gdp->cf_reduce = gdp->cf; + 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); + sscanf(&line[*eaten], "%6[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)) { + if (!strcmp("reduce",command)) { + if (rrd_parse_CF(line,eaten,gdp,&gdp->cf_reduce)) return 1; + if (line[*eaten] != '\0') + (*eaten)--; + } else if (!strcmp("step",command)) { i=0; sscanf(&line[*eaten],"%lu%n",&gdp->step,&i); (*eaten)+=i; @@ -442,10 +543,10 @@ rrd_parse_cdef(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t } void -rrd_graph_script(int argc, char *argv[], image_desc_t *im) { +rrd_graph_script(int argc, char *argv[], image_desc_t *im, int optno) { int i; - for (i=optind+1;igf) { -#if 0 - /* future command */ - case GF_SHIFT: vname:value -#endif + case GF_SHIFT: /* vname:value */ + if (rrd_parse_shift(argv[i],&eaten,gdp,im)) return; + break; case GF_XPORT: + if (rrd_parse_xport(argv[i],&eaten,gdp,im)) return; break; case GF_PRINT: /* vname:CF:format -or- vname:format */ case GF_GPRINT: /* vname:CF:format -or- vname:format */