projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/rrd_daemon.c: Don't return TRUE in `tree_callback_flush'.
[rrdtool.git]
/
src
/
rrd_graph.h
diff --git
a/src/rrd_graph.h
b/src/rrd_graph.h
index
00ab15b
..
c21f356
100644
(file)
--- a/
src/rrd_graph.h
+++ b/
src/rrd_graph.h
@@
-14,8
+14,6
@@
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
#include "rrd_tool.h"
#include "rrd_rpncalc.h"
-#define MAX_VNAME_LEN 255
-#define DEF_NAM_FMT "%255[-_A-Za-z0-9]"
#define ALTYGRID 0x01 /* use alternative y grid algorithm */
#define ALTAUTOSCALE 0x02 /* use alternative algorithm to find lower and upper bounds */
#define ALTYGRID 0x01 /* use alternative y grid algorithm */
#define ALTAUTOSCALE 0x02 /* use alternative algorithm to find lower and upper bounds */
@@
-54,6
+52,7
@@
enum vdef_op_en {
VDEF_MAXIMUM = 0 /* like the MAX in (G)PRINT */
, VDEF_MINIMUM /* like the MIN in (G)PRINT */
, VDEF_AVERAGE /* like the AVERAGE in (G)PRINT */
VDEF_MAXIMUM = 0 /* like the MAX in (G)PRINT */
, VDEF_MINIMUM /* like the MIN in (G)PRINT */
, VDEF_AVERAGE /* like the AVERAGE in (G)PRINT */
+ , VDEF_STDEV /* the standard deviation */
, VDEF_PERCENT /* Nth percentile */
, VDEF_TOTAL /* average multiplied by time */
, VDEF_FIRST /* first non-unknown value and time */
, VDEF_PERCENT /* Nth percentile */
, VDEF_TOTAL /* average multiplied by time */
, VDEF_FIRST /* first non-unknown value and time */
@@
-170,6
+169,13
@@
typedef struct graph_desc_t {
rrd_value_t *data; /* the raw data drawn from the rrd */
rrd_value_t *p_data; /* processed data, xsize elments */
double linewidth; /* linewideth */
rrd_value_t *data; /* the raw data drawn from the rrd */
rrd_value_t *p_data; /* processed data, xsize elments */
double linewidth; /* linewideth */
+
+ /* dashed line stuff */
+ int dash; /* boolean, draw dashed line? */
+ double *p_dashes; /* pointer do dash array which keeps the lengths of dashes */
+ int ndash; /* number of dash segments */
+ double offset; /* dash offset along the line */
+
enum txa_en txtalign; /* change default alignment strategy for text */
} graph_desc_t;
enum txa_en txtalign; /* change default alignment strategy for text */
} graph_desc_t;
@@
-178,7
+184,6
@@
typedef struct image_desc_t {
/* configuration of graph */
char graphfile[MAXPATH]; /* filename for graphic */
/* configuration of graph */
char graphfile[MAXPATH]; /* filename for graphic */
- FILE *graphhandle; /* FILE to use if filename is "-" */
long xsize, ysize; /* graph area size in pixels */
struct gfx_color_t graph_col[__GRC_END__]; /* real colors for the graph */
text_prop_t text_prop[TEXT_PROP_LAST]; /* text properties */
long xsize, ysize; /* graph area size in pixels */
struct gfx_color_t graph_col[__GRC_END__]; /* real colors for the graph */
text_prop_t text_prop[TEXT_PROP_LAST]; /* text properties */
@@
-205,14
+210,17
@@
typedef struct image_desc_t {
char *imginfo; /* construct an <IMG ... tag and return
as first retval */
enum gfx_if_en imgformat; /* image format */
char *imginfo; /* construct an <IMG ... tag and return
as first retval */
enum gfx_if_en imgformat; /* image format */
+ int use_rrdcached;
int lazy; /* only update the image if there is
reasonable probablility that the
existing one is out of date */
int slopemode; /* connect the dots of the curve directly, not using a stair */
int logarithmic; /* scale the yaxis logarithmic */
int lazy; /* only update the image if there is
reasonable probablility that the
existing one is out of date */
int slopemode; /* connect the dots of the curve directly, not using a stair */
int logarithmic; /* scale the yaxis logarithmic */
+ double force_scale_min; /* Force a scale--min */
+ double force_scale_max; /* Force a scale--max */
/* status information */
/* status information */
-
+ int with_markup;
long xorigin, yorigin; /* where is (0,0) of the graph */
long ximg, yimg; /* total size of the image */
size_t rendered_image_size;
long xorigin, yorigin; /* where is (0,0) of the graph */
long ximg, yimg; /* total size of the image */
size_t rendered_image_size;
@@
-236,6
+244,9
@@
typedef struct image_desc_t {
cairo_t *cr; /* drawin context */
cairo_font_options_t *font_options; /* cairo font options */
cairo_antialias_t graph_antialias; /* antialiasing for the graph */
cairo_t *cr; /* drawin context */
cairo_font_options_t *font_options; /* cairo font options */
cairo_antialias_t graph_antialias; /* antialiasing for the graph */
+
+ rrd_info_t *grinfo; /* root pointer to extra graph info */
+ rrd_info_t *grinfo_current; /* pointing to current entry */
} image_desc_t;
/* Prototypes */
} image_desc_t;
/* Prototypes */
@@
-299,8
+310,7
@@
time_t find_next_time(
enum tmt_en,
long);
int print_calc(
enum tmt_en,
long);
int print_calc(
- image_desc_t *,
- char ***);
+ image_desc_t *);
int leg_place(
image_desc_t *,
int *);
int leg_place(
image_desc_t *,
int *);
@@
-319,8
+329,7
@@
void grid_paint(
int lazy_check(
image_desc_t *);
int graph_paint(
int lazy_check(
image_desc_t *);
int graph_paint(
- image_desc_t *,
- char ***);
+ image_desc_t *);
int gdes_alloc(
image_desc_t *);
int gdes_alloc(
image_desc_t *);
@@
-328,15
+337,6
@@
int scan_for_col(
const char *const,
int,
char *const);
const char *const,
int,
char *const);
-int rrd_graph(
- int,
- char **,
- char ***,
- int *,
- int *,
- FILE *,
- double *,
- double *);
void rrd_graph_init(
image_desc_t *);
void rrd_graph_options(
void rrd_graph_init(
image_desc_t *);
void rrd_graph_options(
@@
-366,8
+366,7
@@
int vdef_percent_compar(
const void *);
int graph_size_location(
image_desc_t *,
const void *);
int graph_size_location(
image_desc_t *,
- int
- );
+ int);
/* create a new line */
/* create a new line */
@@
-452,3
+451,9
@@
void gfx_area_fit(
double *y);
#endif
double *y);
#endif
+
+void grinfo_push(
+ image_desc_t *im,
+ char *key,
+ rrd_info_type_t type,
+ rrd_infoval_t value);