#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);
int
data_fetch( image_desc_t *im )
{
- int i,ii;
- int skip;
+ int i,ii;
+ int skip;
+
/* pull the data from the log files ... */
for (i=0;i<im->gdes_c;i++){
/* only GF_DEF elements fetch data */
skip=0;
/* do we have it already ?*/
- for (ii=0;ii<i;ii++){
+ for (ii=0;ii<i;ii++) {
if (im->gdes[ii].gf != GF_DEF)
continue;
- if((strcmp(im->gdes[i].rrd,im->gdes[ii].rrd) == 0)
- && (im->gdes[i].cf == im->gdes[ii].cf)){
- /* OK the data it is here already ...
- * we just copy the header portion */
+ if ((strcmp(im->gdes[i].rrd, im->gdes[ii].rrd) == 0)
+ && (im->gdes[i].cf == im->gdes[ii].cf)
+ && (im->gdes[i].start == im->gdes[ii].start)
+ && (im->gdes[i].end == im->gdes[ii].end)
+ && (im->gdes[i].step == im->gdes[ii].step)) {
+ /* OK, the data is already there.
+ ** Just copy the header portion
+ */
im->gdes[i].start = im->gdes[ii].start;
im->gdes[i].end = im->gdes[ii].end;
im->gdes[i].step = im->gdes[ii].step;
* resulting data source.
*/
for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
- if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE){
+ if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE ||
+ im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){
long ptr = im->gdes[gdi].rpnp[rpi].ptr;
if (im->gdes[ptr].ds_cnt == 0) {
#if 0
-printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n",
+ printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n",
im->gdes[gdi].vname,
im->gdes[ptr].vname);
-printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
+ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
#endif
im->gdes[gdi].rpnp[rpi].val = im->gdes[ptr].vf.val;
im->gdes[gdi].rpnp[rpi].op = OP_NUMBER;
} else {
- if ((steparray = rrd_realloc(steparray, (++stepcnt+1)*sizeof(*steparray)))==NULL){
+ if ((steparray =
+ rrd_realloc(steparray,
+ (++stepcnt+1)*sizeof(*steparray)))==NULL){
rrd_set_error("realloc steparray");
rpnstack_free(&rpnstack);
return -1;
/* move the data pointers to the correct period */
for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
- if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE){
+ if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE ||
+ im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){
long ptr = im->gdes[gdi].rpnp[rpi].ptr;
if(im->gdes[gdi].start > im->gdes[ptr].start) {
im->gdes[gdi].rpnp[rpi].data += im->gdes[gdi].rpnp[rpi].ds_cnt;
unsigned long gr_time;
/* memory for the processed data */
- for(i=0;i<im->gdes_c;i++){
- if((im->gdes[i].gf==GF_LINE) ||
- (im->gdes[i].gf==GF_AREA) ||
- (im->gdes[i].gf==GF_TICK) ||
- (im->gdes[i].gf==GF_STACK)){
- if((im->gdes[i].p_data = malloc((im->xsize +1)
+ for(i=0;i<im->gdes_c;i++) {
+ if((im->gdes[i].gf==GF_LINE) ||
+ (im->gdes[i].gf==GF_AREA) ||
+ (im->gdes[i].gf==GF_TICK) ||
+ (im->gdes[i].gf==GF_STACK)) {
+ if((im->gdes[i].p_data = malloc((im->xsize +1)
* sizeof(rrd_value_t)))==NULL){
- rrd_set_error("malloc data_proc");
- return -1;
+ rrd_set_error("malloc data_proc");
+ return -1;
+ }
}
- }
}
-
- for(i=0;i<im->xsize;i++){
+
+ for (i=0;i<im->xsize;i++) { /* for each pixel */
long vidx;
- gr_time = im->start+pixstep*i; /* time of the
- current step */
+ gr_time = im->start+pixstep*i; /* time of the current step */
paintval=0.0;
- for(ii=0;ii<im->gdes_c;ii++){
- double value;
- switch(im->gdes[ii].gf){
- case GF_LINE:
- case GF_AREA:
+ for (ii=0;ii<im->gdes_c;ii++) {
+ double value;
+ switch (im->gdes[ii].gf) {
+ case GF_LINE:
+ case GF_AREA:
case GF_TICK:
- paintval = 0.0;
- case GF_STACK:
- vidx = im->gdes[ii].vidx;
-
- 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];
-
- if (! isnan(value)) {
- paintval += value;
- im->gdes[ii].p_data[i] = paintval;
- /* GF_TICK: the data values are not relevant for min and max */
- if (finite(paintval) && im->gdes[ii].gf != GF_TICK ){
- if (isnan(minval) || paintval < minval)
- minval = paintval;
- if (isnan(maxval) || paintval > maxval)
- maxval = paintval;
- }
- } else {
- im->gdes[ii].p_data[i] = DNAN;
- }
- break;
- case GF_PRINT:
- case GF_GPRINT:
- case GF_COMMENT:
- case GF_HRULE:
- case GF_VRULE:
- case GF_DEF:
- case GF_CDEF:
- case GF_VDEF:
- case GF_PART:
- case GF_XPORT:
- break;
+ if (!im->gdes[ii].stack)
+ paintval = 0.0;
+ case GF_STACK:
+ 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(
+ (double)(gr_time - im->gdes[vidx].start)
+ / im->gdes[vidx].step)
+ * im->gdes[vidx].ds_cnt
+ + im->gdes[vidx].ds
+ ];
+ } else {
+ value = DNAN;
+ }
+ };
+
+ if (! isnan(value)) {
+ paintval += value;
+ im->gdes[ii].p_data[i] = paintval;
+ /* GF_TICK: the data values are not
+ ** relevant for min and max
+ */
+ if (finite(paintval) && im->gdes[ii].gf != GF_TICK ) {
+ if (isnan(minval) || paintval < minval)
+ minval = paintval;
+ if (isnan(maxval) || paintval > maxval)
+ maxval = paintval;
+ }
+ } else {
+ im->gdes[ii].p_data[i] = DNAN;
+ }
+ break;
+ default:
+ break;
}
}
}
/* adjust min and max values */
if (isnan(im->minval)
- || ((!im->logarithmic && !im->rigid) /* don't adjust low-end with log scale */
- && im->minval > minval))
+ /* don't adjust low-end with log scale */
+ || ((!im->logarithmic && !im->rigid) && im->minval > minval)
+ )
im->minval = minval;
if (isnan(im->maxval)
- || (!im->rigid
- && im->maxval < maxval)){
+ || (!im->rigid && im->maxval < maxval)
+ ) {
if (im->logarithmic)
im->maxval = maxval * 1.1;
else
}
/* make sure min and max are not equal */
if (im->minval == im->maxval) {
- im->maxval *= 1.01;
- if (! im->logarithmic) {
- im->minval *= 0.99;
- }
-
- /* make sure min and max are not both zero */
- if (im->maxval == 0.0) {
+ im->maxval *= 1.01;
+ if (! im->logarithmic) {
+ im->minval *= 0.99;
+ }
+ /* make sure min and max are not both zero */
+ if (im->maxval == 0.0) {
im->maxval = 1.0;
- }
-
+ }
}
return 0;
}
if (im->gdes[i].gf == GF_PRINT){
(*prdata)[prlines-2] = malloc((FMT_LEG_LEN+2)*sizeof(char));
+ (*prdata)[prlines-1] = NULL;
if (bad_format(im->gdes[i].format)) {
rrd_set_error("bad format for [G]PRINT in '%s'", im->gdes[i].format);
return -1;
#else
sprintf((*prdata)[prlines-2],im->gdes[i].format,printval,si_symb);
#endif
- (*prdata)[prlines-1] = NULL;
} else {
/* GF_GPRINT */
if (Xlegend > im->ximg) {
im->ximg = Xlegend;
/* reposition Pie */
+ }
#endif
/* The pie is placed in the upper right hand corner,
&& ! 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;
}
output[outp] = '\0';
return inp;
}
-
/* Some surgery done on this function, it became ridiculously big.
** Things moved:
** - initializing now in rrd_graph_init()
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;
opt = getopt_long(argc, argv,
- "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:z:g",
+ "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:zg",
long_options, &option_index);
if (opt == EOF)
im->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 */
-
- for (i=optind+1;i<argc;i++) {
- int argstart=0;
- int strstart=0;
- graph_desc_t *gdp;
- char *line;
- char funcname[10],vname[MAX_VNAME_LEN+1],sep[1];
- double d;
- double linewidth;
- int j,k,l,m;
-
- /* Each command is one element from *argv[], we call this "line".
- **
- ** 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];
- line=argv[i];
-
- /* 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
- */
- argstart=0;
-
- sscanf(line, "%10[A-Z0-9]:%n", funcname,&argstart);
- if (argstart==0) {
- rrd_set_error("Cannot parse function in line: %s",line);
- im_free(im);
- return;
- }
- if(sscanf(funcname,"LINE%lf",&linewidth)){
- im->gdes[im->gdes_c-1].gf = GF_LINE;
- im->gdes[im->gdes_c-1].linewidth = linewidth;
- } else {
- if ((gdp->gf=gf_conv(funcname))==-1) {
- rrd_set_error("'%s' is not a valid function name",funcname);
- im_free(im);
- return;
- }
- }
-
- /* If the error string is set, we exit at the end of the switch */
- switch (gdp->gf) {
- case GF_XPORT:
- break;
- case GF_COMMENT:
- if (rrd_graph_legend(gdp,&line[argstart])==0)
- rrd_set_error("Cannot parse comment in line: %s",line);
- break;
- case GF_PART:
- case GF_VRULE:
- case GF_HRULE:
- j=k=l=m=0;
- sscanf(&line[argstart], "%lf%n#%n", &d, &j, &k);
- sscanf(&line[argstart], DEF_NAM_FMT "%n#%n", vname, &l, &m);
- if (k+m==0) {
- rrd_set_error("Cannot parse name or num in line: %s",line);
- break;
- }
- if (j!=0) {
- gdp->xrule=d;
- gdp->yrule=d;
- argstart+=j;
- } else if (!rrd_graph_check_vname(im,vname,line)) {
- gdp->xrule=0;
- gdp->yrule=DNAN;
- argstart+=l;
- } else break; /* exit due to wrong vname */
- if ((j=rrd_graph_color(im,&line[argstart],line,0))==0) break;
- argstart+=j;
- if (strlen(&line[argstart])!=0) {
- if (rrd_graph_legend(gdp,&line[++argstart])==0)
- rrd_set_error("Cannot parse comment in line: %s",line);
- }
- 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:
- j=k=0;
- linepass=1;
- sscanf(&line[argstart],DEF_NAM_FMT"%n%1[#:]%n",vname,&j,sep,&k);
- if (j+1!=k)
- rrd_set_error("Cannot parse vname in line: %s",line);
- else if (rrd_graph_check_vname(im,vname,line))
- rrd_set_error("Undefined vname '%s' in line: %s",line);
- else
- k=rrd_graph_color(im,&line[argstart],line,1);
- if (rrd_test_error()) break;
- argstart=argstart+j+k;
- if ((strlen(&line[argstart])!=0)&&(gdp->gf==GF_TICK)) {
- j=0;
- sscanf(&line[argstart], ":%lf%n", &gdp->yrule,&j);
- argstart+=j;
- }
- if (strlen(&line[argstart])!=0)
- if (rrd_graph_legend(gdp,&line[++argstart])==0)
- rrd_set_error("Cannot parse legend in line: %s",line);
- 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;
- sscanf(&line[argstart], DEF_NAM_FMT "=%n",gdp->vname,&j);
- if (j==0) {
- rrd_set_error("Could not parse line: %s",line);
- break;
- }
- if (find_var(im,gdp->vname)!=-1) {
- rrd_set_error("Variable '%s' in line '%s' already in use\n",
- gdp->vname,line);
- break;
- }
- argstart+=j;
- switch (gdp->gf) {
- case GF_DEF:
- argstart+=scan_for_col(&line[argstart],MAXPATH,gdp->rrd);
- j=k=0;
- sscanf(&line[argstart],
- ":" DS_NAM_FMT ":" CF_NAM_FMT "%n%*s%n",
- gdp->ds_nam, symname, &j, &k);
- if ((j==0)||(k!=0)) {
- rrd_set_error("Cannot parse DS or CF in '%s'",line);
- break;
- }
- rrd_graph_check_CF(im,symname,line);
- break;
- case GF_VDEF:
- j=0;
- sscanf(&line[argstart],DEF_NAM_FMT ",%n",vname,&j);
- if (j==0) {
- rrd_set_error("Cannot parse vname in line '%s'",line);
- break;
- }
- argstart+=j;
- 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,&line[argstart+strstart]);
- break;
- case GF_CDEF:
- if (strstr(&line[argstart],":")!=NULL) {
- rrd_set_error("Error in RPN, line: %s",line);
- break;
- }
- if ((gdp->rpnp = rpn_parse(
- (void *)im,
- &line[argstart],
- &find_var_wrapper)
- )==NULL)
- rrd_set_error("invalid rpn expression in: %s",line);
- 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;
field = (steps-1)*dst->vf.param/100;
dst->vf.val = array[field];
dst->vf.when = 0; /* no time component */
+ free(array);
#if 0
for(step=0;step<steps;step++)
printf("DEBUG: %3li:%10.2f %c\n",step,array[step],step==field?'*':' ');
projects / rrdtool.git / blobdiff