diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 5182898ef7f3ee4c443a6c0c0a8b21b41d36ecd2..0d3a3007f55dc69791bbda297aa7f9e0c303af97 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.8 Copyright by Tobi Oetiker, 1997-2013
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
+#else
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-#include "../win32/config.h"
+#endif
#endif
#include "rrd.h"
#endif
#include "rrd.h"
#else
/* unix-only includes */
#else
/* unix-only includes */
-#if !defined isnan && !defined HAVE_ISNAN
+#if !defined(isnan) && !defined(HAVE_ISNAN)
int isnan(
double value);
#endif
int isnan(
double value);
#endif
#endif
/* local include files -- need to be after the system ones */
#endif
/* local include files -- need to be after the system ones */
+#ifdef HAVE_GETOPT_LONG
+#define _GNU_SOURCE
+#include <getopt.h>
+#else
#include "rrd_getopt.h"
#include "rrd_getopt.h"
+#endif
+
#include "rrd_format.h"
#ifndef max
#include "rrd_format.h"
#ifndef max
#define DIM(x) (sizeof(x)/sizeof(x[0]))
#define DIM(x) (sizeof(x)/sizeof(x[0]))
- info_t *rrd_info(
- int,
- char **);
- int rrd_lastupdate(
- int argc,
- char **argv,
- time_t *last_update,
- unsigned long *ds_cnt,
- char ***ds_namv,
- char ***last_ds);
- info_t *rrd_update_v(
- int,
- char **);
char *sprintf_alloc(
char *,
...);
char *sprintf_alloc(
char *,
...);
- info_t *info_push(
- info_t *,
- char *,
- enum info_type,
- infoval);
- void info_print(
- info_t *data);
- void info_free(
- info_t *);
/* HELPER FUNCTIONS */
/* HELPER FUNCTIONS */
int rrd_create_fn(
const char *file_name,
rrd_t *rrd);
int rrd_create_fn(
const char *file_name,
rrd_t *rrd);
- int rrd_fetch_fn(
- const char *filename,
- enum cf_en cf_idx,
- time_t *start,
- time_t *end,
- unsigned long *step,
- unsigned long *ds_cnt,
- char ***ds_namv,
- rrd_value_t **data);
-
- void rrd_free(
- rrd_t *rrd);
- void rrd_freemem(
- void *mem);
- void rrd_init(
- rrd_t *rrd);
-
- rrd_file_t *rrd_open(
- const char *const file_name,
- rrd_t *rrd,
- unsigned rdwr);
- void rrd_dontneed(
- rrd_file_t *rrd_file,
- rrd_t *rrd);
- int rrd_close(
- rrd_file_t *rrd_file);
- ssize_t rrd_read(
- rrd_file_t *rrd_file,
- void *buf,
- size_t count);
- ssize_t rrd_write(
- rrd_file_t *rrd_file,
- const void *buf,
- size_t count);
- void rrd_flush(
- rrd_file_t *rrd_file);
- off_t rrd_seek(
- rrd_file_t *rrd_file,
- off_t off,
- int whence);
- off_t rrd_tell(
- rrd_file_t *rrd_file);
- int readfile(
- const char *file,
- char **buffer,
- int skipfirst);
+ int rrd_fetch_fn (const char *filename,
+ enum cf_en cf_idx,
+ time_t *start,
+ time_t *end,
+ unsigned long *step,
+ unsigned long *ds_cnt,
+ char ***ds_namv,
+ rrd_value_t **data);
+
+
+#ifdef HAVE_LIBDBI
+int rrd_fetch_fn_libdbi(const char *filename, enum cf_en cf_idx,
+ time_t *start,time_t *end,
+ unsigned long *step,
+ unsigned long *ds_cnt,
+ char ***ds_namv,
+ rrd_value_t **data);
+#endif
#define RRD_READONLY (1<<0)
#define RRD_READWRITE (1<<1)
#define RRD_CREAT (1<<2)
#define RRD_READAHEAD (1<<3)
#define RRD_COPY (1<<4)
#define RRD_READONLY (1<<0)
#define RRD_READWRITE (1<<1)
#define RRD_CREAT (1<<2)
#define RRD_READAHEAD (1<<3)
#define RRD_COPY (1<<4)
+#define RRD_EXCL (1<<5)
enum cf_en cf_conv(
const char *string);
enum cf_en cf_conv(
const char *string);
long ds_match(
rrd_t *rrd,
char *ds_nam);
long ds_match(
rrd_t *rrd,
char *ds_nam);
+ off_t rrd_get_header_size(
+ rrd_t *rrd);
double rrd_diff(
char *a,
char *b);
double rrd_diff(
char *a,
char *b);
- /* 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
+#endif /* _RRD_TOOL_H */
#ifdef __cplusplus
}
#ifdef __cplusplus
}