X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.h;h=37f4a7ed53447dd5b2d4945b690d8191955e86a0;hp=279566512bede984765e72d1804936029c0f9ada;hb=bac209eb1d120c27acc1ede8fa7dfef81f3eaaf1;hpb=7c016dfa001ae254bf4e18126f814ee8f0abd821 diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 2795665..37f4a7e 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -1,20 +1,7 @@ /***************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.2rc3 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * rrd_tool.h Common Header File - ***************************************************************************** - * $Id$ - * $Log$ - * Revision 1.2 2001/03/04 13:01:55 oetiker - * Aberrant Behavior Detection support. A brief overview added to rrdtool.pod. - * Major updates to rrd_update.c, rrd_create.c. Minor update to other core files. - * This is backwards compatible! But new files using the Aberrant stuff are not readable - * by old rrdtool versions. See http://cricket.sourceforge.net/aberrant/rrd_hw.htm - * -- Jake Brutlag - * - * Revision 1.1.1.1 2001/02/25 22:25:06 oetiker - * checkin - * *****************************************************************************/ #ifdef __cplusplus extern "C" { @@ -24,8 +11,8 @@ extern "C" { #ifndef _RRD_TOOL_H #define _RRD_TOOL_H -#ifdef WIN32 -# include "ntconfig.h" +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) +#include "../confignt/config.h" #else #ifdef HAVE_CONFIG_H #include @@ -58,6 +45,36 @@ extern "C" { #if HAVE_MATH_H # include #endif +/* Sorry: don't know autoconf as well how to check the exist of + dirent.h ans sys/stat.h +*/ + +#if HAVE_DIRENT_H +# include +# define NAMLEN(dirent) strlen((dirent)->d_name) +#else +# define dirent direct +# define NAMLEN(dirent) (dirent)->d_namlen +# if HAVE_SYS_NDIR_H +# include +# endif +# if HAVE_SYS_DIR_H +# include +# endif +# if HAVE_NDIR_H +# include +# endif +#endif + +#if HAVE_SYS_TYPES_H +# include +#endif + +#if HAVE_SYS_STAT_H +# include +#endif + + #if HAVE_UNISTD_H # include #endif @@ -78,14 +95,7 @@ extern int getrusage(int, struct rusage *); #include "rrd.h" -#ifndef WIN32 - -/* unix-only includes */ -#ifndef isnan -int isnan(double value); -#endif - -#else +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) /* Win32 only includes */ @@ -93,6 +103,18 @@ int isnan(double value); #define isnan _isnan #define finite _finite #define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF) +struct tm* localtime_r(const time_t *timep, struct tm* result); +char* ctime_r(const time_t *timep, char* result); +struct tm* gmtime_r(const time_t *timep, struct tm* result); +char *strtok_r(char *str, const char *sep, char **last); + +#else + +/* unix-only includes */ +#ifndef isnan +int isnan(double value); +#endif + #endif /* local include files -- need to be after the system ones */ @@ -112,12 +134,14 @@ int isnan(double value); /* rrd info interface */ enum info_type { RD_I_VAL=0, RD_I_CNT, - RD_I_STR }; + RD_I_STR, + RD_I_INT }; typedef union infoval { unsigned long u_cnt; rrd_value_t u_val; char *u_str; + int u_int; } infoval; typedef struct info_t { @@ -127,16 +151,14 @@ typedef struct info_t { struct info_t *next; } info_t; - info_t *rrd_info(int, char **); +info_t *rrd_update_v(int, char **); +char * sprintf_alloc(char *, ...); +info_t *info_push(info_t *, char *, enum info_type, infoval); /* HELPER FUNCTIONS */ -int GifSize(FILE *, long *, long *); -int PngSize(FILE *, long *, long *); -int PngSize(FILE *, long *, long *); -#include -void gdImagePng(gdImagePtr im, FILE *out); +int PngSize(FILE *, long *, long *); int rrd_create_fn(char *file_name, rrd_t *rrd); int rrd_fetch_fn(char *filename, enum cf_en cf_idx, @@ -147,10 +169,11 @@ int rrd_fetch_fn(char *filename, enum cf_en cf_idx, rrd_value_t **data); void rrd_free(rrd_t *rrd); +void rrd_freemem(void *mem); void rrd_init(rrd_t *rrd); -int rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr); -int readfile(char *file, char **buffer, int skipfirst); +int rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr); +int readfile(const char *file, char **buffer, int skipfirst); #define RRD_READONLY 0 #define RRD_READWRITE 1 @@ -160,36 +183,13 @@ enum dst_en dst_conv(char *string); long ds_match(rrd_t *rrd,char *ds_nam); double rrd_diff(char *a, char *b); -/* functions added for aberrant behavior detection. - * implemented for the most part in rrd_hw.c */ -int update_aberrant_CF(rrd_t *rrd, rrd_value_t pdp_val, enum cf_en current_cf, - unsigned long cdp_idx, unsigned long rra_idx, unsigned long ds_idx, - unsigned short CDP_scratch_idx, rrd_value_t *seasonal_coef); -int create_hw_contingent_rras(rrd_t *rrd, unsigned short period, - unsigned long hashed_name); -int lookup_seasonal(rrd_t *rrd, unsigned long rra_idx, unsigned long rra_start, - FILE *rrd_file, unsigned long offset, rrd_value_t **seasonal_coef); -void erase_violations(rrd_t *rrd, unsigned long cdp_idx, unsigned long rra_idx); -int apply_smoother(rrd_t *rrd, unsigned long rra_idx, unsigned long rra_start, - FILE *rrd_file); - -/* a standard fixed-capacity FIFO queue implementation */ -typedef struct FIFOqueue { - rrd_value_t *queue; - int capacity, head, tail; -} FIFOqueue; - -int queue_alloc(FIFOqueue **q,int capacity); -void queue_dealloc(FIFOqueue *q); -void queue_push(FIFOqueue *q, rrd_value_t value); -int queue_isempty(FIFOqueue *q); -rrd_value_t queue_pop(FIFOqueue *q); - -#define BURNIN_CYCLES 3 + /* 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); #endif - #ifdef __cplusplus } #endif