X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd.h;h=d87275e487ae76524d27086a917563d550b6ab2d;hb=eaf3af3f1af054366dbdf3eb522f5ef270759604;hp=b6b51ee7eef893461f2cb5832509cd6d145ca127;hpb=e357fb7d089224a089b6b34699f592a29a20fd59;p=rrdtool.git diff --git a/src/rrd.h b/src/rrd.h index b6b51ee..d87275e 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 ***************************************************************************** @@ -171,13 +171,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 +192,7 @@ extern "C" { unsigned long *, char ***, rrd_value_t **); + int rrd_cmd_flush (int argc, char **argv); void rrd_freemem( void *mem); @@ -209,6 +204,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 +214,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); @@ -322,36 +323,53 @@ 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; + 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 */