X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd.h;h=d907d18443f09e1fc3c3ff9f49be89b1042161ea;hp=078e29ecc5621a3e2efb6f1309cfc1023d197ba8;hb=990fcfb7eec407edfe504f42760bae204e1c074d;hpb=0dd9e81745110d811a021513843c05fead623b8d diff --git a/src/rrd.h b/src/rrd.h index 078e29e..d907d18 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -1,10 +1,26 @@ /***************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997,1998, 1999 + * RRDtool 1.2rc9 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * 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. + * * Revision 1.4 2003/04/01 22:52:23 jake * Fix Win32 build. VC++ 6.0 and 7.0 now use the thread-safe code. * @@ -47,13 +63,14 @@ 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 **); int rrd_xport(int, char **, int *, time_t *, time_t *, unsigned long *, unsigned long *, @@ -63,12 +80,13 @@ int rrd_xport(int, char **, int *, time_t *, time_t *, int rrd_create_r(char *filename, unsigned long pdp_step, time_t last_up, int argc, char **argv); -/* NOTE: rrd_update_r is only thread-safe if no at-style time +/* 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); +time_t rrd_last_r(const char *filename); +time_t rrd_first_r(const char *filename, int rraindex); /* Transplanted from parsetime.h */ typedef enum { @@ -79,7 +97,7 @@ typedef enum { #define TIME_OK NULL -struct time_value { +struct rrd_time_value { timetype type; long offset; struct tm tm; @@ -95,10 +113,10 @@ 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); +char *parsetime(const char *spec, struct rrd_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 *,...);