X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd.h;h=31fd468d43acb6b70ee08d6029c2f7c15e61df1f;hp=1a83746158085452ed10b4bef784742c571b7a2c;hb=35354e059a77479a7a135c1e4fc71c76523fd7c4;hpb=5493345a7b1e79ef80e6f333b3b5162b976390b9 diff --git a/src/rrd.h b/src/rrd.h index 1a83746..31fd468 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrdlib.h Public header file for librrd ***************************************************************************** @@ -57,6 +57,21 @@ extern "C" { #include #include /* for FILE */ + +/* Formerly rrd_nan_inf.h */ +#ifndef DNAN +# define DNAN rrd_set_to_DNAN() +#endif + +#ifndef DINF +# define DINF rrd_set_to_DINF() +#endif + double rrd_set_to_DNAN( + void); + double rrd_set_to_DINF( + void); +/* end of rrd_nan_inf.h */ + /* Transplanted from rrd_format.h */ typedef double rrd_value_t; /* the data storage type is * double */ @@ -71,13 +86,57 @@ extern "C" { off_t pos; /* current pos in file */ } rrd_file_t; +/* rrd info interface */ + typedef struct rrd_blob_t { + unsigned long size; /* size of the blob */ + unsigned char *ptr; /* pointer */ + } rrd_blob_t; + + typedef enum rrd_info_type { RD_I_VAL = 0, + RD_I_CNT, + RD_I_STR, + RD_I_INT, + RD_I_BLO + } rrd_info_type_t; + + typedef union rrd_infoval { + unsigned long u_cnt; + rrd_value_t u_val; + char *u_str; + int u_int; + rrd_blob_t u_blo; + } rrd_infoval_t; + + typedef struct rrd_info_t { + char *key; + rrd_info_type_t type; + rrd_infoval_t value; + struct rrd_info_t *next; + } rrd_info_t; + + /* main function blocks */ int rrd_create( int, char **); + rrd_info_t *rrd_info( + int, + char **); + rrd_info_t *rrd_info_push( + rrd_info_t *, + char *, + rrd_info_type_t, + rrd_infoval_t); + void rrd_info_print( + rrd_info_t * data); + void rrd_info_free( + rrd_info_t *); int rrd_update( int, char **); + rrd_info_t *rrd_update_v( + int, + char **); int rrd_graph( int, char **, @@ -87,16 +146,9 @@ extern "C" { FILE *, double *, double *); - - unsigned char *rrd_graph_in_memory( - int argc, - char **argv, - char ***prdata, - int *xsize, - int *ysize, - double *ymin, - double *ymax, - size_t * img_size); + rrd_info_t *rrd_graph_v( + int, + char **); int rrd_fetch( int, @@ -119,6 +171,13 @@ extern "C" { time_t rrd_last( int, char **); + int rrd_lastupdate( + int argc, + char **argv, + time_t *last_update, + unsigned long *ds_cnt, + char ***ds_namv, + char ***last_ds); time_t rrd_first( int, char **); @@ -140,6 +199,9 @@ extern "C" { char ***, rrd_value_t **); + void rrd_freemem( + void *mem); + /* thread-safe (hopefully) */ int rrd_create_r( const char *filename, @@ -173,41 +235,39 @@ extern "C" { const char *filename, int rraindex); -/* Transplanted from parsetime.h */ +/* Transplanted from rrd_parsetime.h */ typedef enum { ABSOLUTE_TIME, RELATIVE_TO_START_TIME, RELATIVE_TO_END_TIME - } timetype; + } rrd_timetype_t; #define TIME_OK NULL - struct rrd_time_value { - timetype type; + typedef struct rrd_time_value { + rrd_timetype_t type; long offset; struct tm tm; - }; + } rrd_time_value_t; - char *parsetime( + char *rrd_parsetime( const char *spec, - struct rrd_time_value *ptv); -/* END parsetime.h */ + rrd_time_value_t * ptv); +/* END rrd_parsetime.h */ - struct rrd_context { - int len; - int errlen; - char *lib_errstr; - char *rrd_error; - }; + typedef struct rrd_context { + char lib_errstr[256]; + char rrd_error[4096]; + } rrd_context_t; /* returns the current per-thread rrd_context */ - struct rrd_context *rrd_get_context( + rrd_context_t *rrd_get_context( void); - int proc_start_end( - struct rrd_time_value *, - struct rrd_time_value *, + int rrd_proc_start_end( + rrd_time_value_t *, + rrd_time_value_t *, time_t *, time_t *); @@ -222,19 +282,76 @@ extern "C" { char *rrd_get_error( void); + /* rrd_strerror is thread safe, but still it uses a global buffer + (but one per thread), thus subsequent calls within a single + thread overwrite the same buffer */ + const char *rrd_strerror( + int err); + /** MULTITHREADED HELPER FUNCTIONS */ - struct rrd_context *rrd_new_context( + rrd_context_t *rrd_new_context( void); void rrd_free_context( - struct rrd_context *buf); + rrd_context_t * buf); + +/* void rrd_set_error_r (rrd_context_t *, char *, ...); */ +/* void rrd_clear_error_r(rrd_context_t *); */ +/* int rrd_test_error_r (rrd_context_t *); */ +/* char *rrd_get_error_r (rrd_context_t *); */ + +/* + * The following functions are _internal_ functions needed to read the raw RRD + * files. Since they are _internal_ they may change with the file format and + * will be replaced with a more general interface in RRDTool 1.4. Don't use + * these functions unless you have good reasons to do so. If you do use these + * functions you will have to adapt your code for RRDTool 1.4! + * + * To enable the deprecated functions define `RRD_EXPORT_DEPRECATED' before + * including . You have been warned! If you come back to the + * RRDTool mailing list and whine about your broken application, you will get + * hit with something smelly! + */ +#if defined(_RRD_TOOL_H) || defined(RRD_EXPORT_DEPRECATED) + +# if defined(_RRD_TOOL_H) +# include "rrd_format.h" +# else +# include +# endif + +#if defined(__GNUC__) && defined (RRD_EXPORT_DEPRECATED) +# define RRD_DEPRECATED __attribute__((deprecated)) +#else +# define RRD_DEPRECATED /**/ +#endif + + void rrd_free (rrd_t *rrd) + RRD_DEPRECATED; + void rrd_init (rrd_t *rrd) + RRD_DEPRECATED; -/* void rrd_set_error_r (struct rrd_context *, char *, ...); */ -/* void rrd_clear_error_r(struct rrd_context *); */ -/* int rrd_test_error_r (struct rrd_context *); */ -/* char *rrd_get_error_r (struct rrd_context *); */ + rrd_file_t *rrd_open (const char *const file_name, rrd_t *rrd, + unsigned rdwr) + RRD_DEPRECATED; - int LockRRD( - int in_file); + void rrd_dontneed (rrd_file_t *rrd_file, rrd_t *rrd) + RRD_DEPRECATED; + int rrd_close (rrd_file_t *rrd_file) + RRD_DEPRECATED; + ssize_t rrd_read (rrd_file_t *rrd_file, void *buf, size_t count) + RRD_DEPRECATED; + ssize_t rrd_write (rrd_file_t *rrd_file, + const void *buf, size_t count) + RRD_DEPRECATED; + void rrd_flush (rrd_file_t *rrd_file) + RRD_DEPRECATED; + off_t rrd_seek (rrd_file_t *rrd_file, off_t off, int whence) + RRD_DEPRECATED; + off_t rrd_tell (rrd_file_t *rrd_file) + RRD_DEPRECATED; + int rrd_lock (rrd_file_t *file) + RRD_DEPRECATED; +#endif /* defined(_RRD_TOOL_H) || defined(RRD_EXPORT_DEPRECATED) */ #endif /* _RRDLIB_H */