X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd.h;h=fcc8523c78e0678950c28e0cad1f1f1e1c3a3847;hb=734468bcc23497c7eba0deba87c92aa219fd46d1;hp=a2478b26844ae52cc345f6a477d6ef5de2d04b69;hpb=bf7d0302ab2ff46038f7002a9eab76f4105c3cee;p=rrdtool.git diff --git a/src/rrd.h b/src/rrd.h index a2478b2..fcc8523 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -1,10 +1,23 @@ /***************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997,1998, 1999 + * RRDtool 1.2.17 Copyright by Tobi Oetiker, 1997-2006 ***************************************************************************** * 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 + * + * Revision 1.6 2003/11/11 19:46:21 oetiker + * replaced time_value with rrd_time_value as MacOS X introduced a struct of that name in their standard headers + * * Revision 1.5 2003/04/25 18:35:08 jake * Alternate update interface, updatev. Returns info about CDPs written to disk as result of update. Output format is similar to rrd_info, a hash of key-values. * @@ -50,14 +63,17 @@ 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 *); +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 **); @@ -68,10 +84,12 @@ int rrd_create_r(char *filename, int argc, 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_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 { @@ -82,12 +100,15 @@ typedef enum { #define TIME_OK NULL -struct time_value { +struct rrd_time_value { timetype type; long offset; struct tm tm; }; +char *parsetime(const char *spec, struct rrd_time_value *ptv); +/* END parsetime.h */ + struct rrd_context { int len; int errlen; @@ -98,10 +119,8 @@ struct rrd_context { /* returns the current per-thread rrd_context */ struct rrd_context *rrd_get_context(void); -char *parsetime(char *spec, struct time_value *ptv); -/* END parsetime.h */ -int proc_start_end (struct time_value *, struct time_value *, time_t *, time_t *); +int proc_start_end (struct rrd_time_value *, struct rrd_time_value *, time_t *, time_t *); /* HELPER FUNCTIONS */ void rrd_set_error(char *,...);