X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd.h;h=fd506d94e9c4533782d75e0212eb3e6775456a3d;hp=b6b51ee7eef893461f2cb5832509cd6d145ca127;hb=2f0b984b0dfee0a8ab2cb1d41670f40a07ec5cdb;hpb=e357fb7d089224a089b6b34699f592a29a20fd59 diff --git a/src/rrd.h b/src/rrd.h index b6b51ee..fd506d9 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrdlib.h Public header file for librrd ***************************************************************************** @@ -53,10 +53,17 @@ extern "C" { #define _RRDLIB_H #include /* for off_t */ + +#ifndef WIN32 #include /* for off_t */ +#else + typedef size_t ssize_t; + typedef long off_t; +#endif + #include #include /* for FILE */ - +#include /* Formerly rrd_nan_inf.h */ #ifndef DNAN @@ -79,13 +86,22 @@ extern "C" { /* information about an rrd file */ typedef struct rrd_file_t { - int fd; /* file descriptor if this rrd file */ - char *file_start; /* start address of an open rrd file */ - off_t header_len; /* length of the header of this rrd file */ - off_t file_len; /* total size of the rrd file */ - off_t pos; /* current pos in file */ + size_t header_len; /* length of the header of this rrd file */ + size_t file_len; /* total size of the rrd file */ + size_t pos; /* current pos in file */ + void *pvt; } rrd_file_t; +/* information used for the conventional file access methods */ + typedef struct rrd_simple_file_t { + int fd; /* file descriptor of this rrd file */ +#ifdef HAVE_MMAP + char *file_start; /* start address of an open rrd file */ + int mm_prot; + int mm_flags; +#endif + } rrd_simple_file_t; + /* rrd info interface */ typedef struct rrd_blob_t { unsigned long size; /* size of the blob */ @@ -171,13 +187,7 @@ 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); + int rrd_lastupdate(int argc, char **argv); time_t rrd_first( int, char **); @@ -198,6 +208,7 @@ extern "C" { unsigned long *, char ***, rrd_value_t **); + int rrd_cmd_flush (int argc, char **argv); void rrd_freemem( void *mem); @@ -209,6 +220,8 @@ extern "C" { time_t last_up, int argc, const char **argv); + rrd_info_t *rrd_info_r( + char *); /* NOTE: rrd_update_r are only thread-safe if no at-style time specifications get used!!! */ @@ -217,20 +230,24 @@ extern "C" { 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_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_last_r (const char *filename); + int rrd_lastupdate_r (const char *filename, + time_t *ret_last_update, + unsigned long *ret_ds_count, + char ***ret_ds_names, + char ***ret_last_ds); time_t rrd_first_r( const char *filename, int rraindex); @@ -261,11 +278,14 @@ extern "C" { } rrd_context_t; /* returns the current per-thread rrd_context */ - rrd_context_t *rrd_get_context( - void); + rrd_context_t *rrd_get_context(void); +#ifdef WIN32 +/* this was added by the win32 porters Christof.Wegmann@exitgames.com */ + rrd_context_t *rrd_force_new_context(void); +#endif - int rrd_proc_start_end( +int rrd_proc_start_end( rrd_time_value_t *, rrd_time_value_t *, time_t *, @@ -299,6 +319,10 @@ extern "C" { /* int rrd_test_error_r (rrd_context_t *); */ /* char *rrd_get_error_r (rrd_context_t *); */ +/** UTILITY FUNCTIONS */ + + long rrd_random(void); + /* * 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 @@ -322,36 +346,62 @@ extern "C" { #if defined(__GNUC__) && defined (RRD_EXPORT_DEPRECATED) # define RRD_DEPRECATED __attribute__((deprecated)) #else -# define RRD_DEPRECATED /**/ +# define RRD_DEPRECATED /**/ #endif - - void rrd_free (rrd_t *rrd) - RRD_DEPRECATED; - void rrd_init (rrd_t *rrd) - RRD_DEPRECATED; - - rrd_file_t *rrd_open (const char *const file_name, rrd_t *rrd, - unsigned rdwr) - RRD_DEPRECATED; - - 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) */ + void rrd_free( + rrd_t *rrd) + RRD_DEPRECATED; + void rrd_init( + rrd_t *rrd) + RRD_DEPRECATED; + + rrd_file_t *rrd_open( + const char *const file_name, + rrd_t *rrd, + unsigned rdwr) + RRD_DEPRECATED; + + 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; + 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; + void rrd_notify_row( + rrd_file_t *rrd_file, + int rra_idx, + unsigned long rra_row, + time_t rra_time) + RRD_DEPRECATED; + unsigned long rrd_select_initial_row( + rrd_file_t *rrd_file, + int rra_idx, + rra_def_t *rra + ) + RRD_DEPRECATED; +#endif /* defined(_RRD_TOOL_H) || defined(RRD_EXPORT_DEPRECATED) */ #endif /* _RRDLIB_H */