X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd.h;h=3873033e7696c6146a0a9d00a72aff586339c4b2;hb=49129134ea26ca65862bc9da64f36fe5aaf8fe83;hp=902f72ad598f993e47e5e773811341aa1635c5ba;hpb=d1e55cdc27a837fb0f4c54ed019e3946e7a6e08b;p=rrdtool.git diff --git a/src/rrd.h b/src/rrd.h index 902f72a..3873033 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -1,10 +1,17 @@ /***************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997,1998, 1999 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrdlib.h Public header file for librrd ***************************************************************************** * $Id$ * $Log$ + * Revision 1.9 2005/02/13 16:13:33 oetiker + * let rrd_graph return the actual value range it picked ... + * -- Henrik Stoerner + * + * Revision 1.8 2004/05/26 22:11:12 oetiker + * reduce compiler warnings. Many small fixes. -- Mike Slifcak + * * Revision 1.7 2003/11/12 22:14:26 oetiker * allow to pass an open filehandle into rrd_graph as an extra argument * @@ -56,28 +63,39 @@ typedef double rrd_value_t; /* the data storage type is /* main function blocks */ int rrd_create(int, char **); int rrd_update(int, char **); -int rrd_graph(int, char **, char ***, int *, int *, FILE *); +int rrd_graph(int, char **, char ***, int *, int *, FILE *, double *, double *); int rrd_fetch(int, char **, time_t *, time_t *, unsigned long *, unsigned long *, char ***, rrd_value_t **); int rrd_restore(int, char **); int rrd_dump(int, char **); int rrd_tune(int, char **); time_t rrd_last(int, char **); +time_t rrd_first(int, char **); int rrd_resize(int, char **); +char * rrd_strversion(void); +double rrd_version(void); int rrd_xport(int, char **, int *, time_t *, time_t *, unsigned long *, unsigned long *, char ***, rrd_value_t **); /* thread-safe (hopefully) */ -int rrd_create_r(char *filename, +int rrd_create_r(const char *filename, unsigned long pdp_step, time_t last_up, - int argc, char **argv); + int argc, const char **argv); /* NOTE: rrd_update_r are only thread-safe if no at-style time specifications get used!!! */ -int rrd_update_r(char *filename, char *_template, - int argc, char **argv); -int rrd_dump_r(char *filename); -time_t rrd_last_r(char *filename); + +int rrd_update_r(const char *filename, const char *_template, + int argc, const char **argv); +int rrd_fetch_r(const char *filename, const char* cf, + time_t *start, time_t *end, + unsigned long *step, + unsigned long *ds_cnt, + char ***ds_namv, + rrd_value_t **data); +int rrd_dump_r(const char *filename, char *outname); +time_t rrd_last_r(const char *filename); +time_t rrd_first_r(const char *filename, int rraindex); /* Transplanted from parsetime.h */ typedef enum { @@ -94,6 +112,9 @@ struct rrd_time_value { struct tm tm; }; +char *parsetime(const char *spec, struct rrd_time_value *ptv); +/* END parsetime.h */ + struct rrd_context { int len; int errlen; @@ -104,8 +125,6 @@ struct rrd_context { /* returns the current per-thread rrd_context */ struct rrd_context *rrd_get_context(void); -char *parsetime(char *spec, struct rrd_time_value *ptv); -/* END parsetime.h */ int proc_start_end (struct rrd_time_value *, struct rrd_time_value *, time_t *, time_t *);