projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix rrd_getops use of external variables (optarg and friends) ... most
[rrdtool.git]
/
src
/
rrd.h
diff --git
a/src/rrd.h
b/src/rrd.h
index
3e0c871
..
0227ed4
100644
(file)
--- a/
src/rrd.h
+++ b/
src/rrd.h
@@
-53,10
+53,17
@@
extern "C" {
#define _RRDLIB_H
#include <sys/types.h> /* for off_t */
#define _RRDLIB_H
#include <sys/types.h> /* for off_t */
+
+#ifndef WIN32
#include <unistd.h> /* for off_t */
#include <unistd.h> /* for off_t */
+#else
+ typedef size_t ssize_t;
+ typedef long off_t;
+#endif
+
#include <time.h>
#include <stdio.h> /* for FILE */
#include <time.h>
#include <stdio.h> /* for FILE */
-
+#include <string.h>
/* Formerly rrd_nan_inf.h */
#ifndef DNAN
/* Formerly rrd_nan_inf.h */
#ifndef DNAN
@@
-79,9
+86,9
@@
extern "C" {
/* information about an rrd file */
typedef struct rrd_file_t {
/* information about an rrd file */
typedef struct rrd_file_t {
-
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;
void *pvt;
} rrd_file_t;
@@
-271,11
+278,14
@@
extern "C" {
} rrd_context_t;
/* returns the current per-thread rrd_context */
} 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 *,
rrd_time_value_t *,
rrd_time_value_t *,
time_t *,
@@
-309,6
+319,14
@@
extern "C" {
/* int rrd_test_error_r (rrd_context_t *); */
/* char *rrd_get_error_r (rrd_context_t *); */
/* int rrd_test_error_r (rrd_context_t *); */
/* char *rrd_get_error_r (rrd_context_t *); */
+/** UTILITY FUNCTIONS */
+
+ long rrd_random(void);
+
+ int rrd_add_ptr(void ***dest, size_t *dest_size, void *src);
+ int rrd_add_strdup(char ***dest, size_t *dest_size, char *src);
+ void rrd_free_ptrs(void ***src, size_t *cnt);
+
/*
* 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
/*
* 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
@@
-364,9
+382,6
@@
extern "C" {
const void *buf,
size_t count)
RRD_DEPRECATED;
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,
off_t rrd_seek(
rrd_file_t *rrd_file,
off_t off,
@@
-378,6
+393,18
@@
extern "C" {
int rrd_lock(
rrd_file_t *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 */
#endif /* defined(_RRD_TOOL_H) || defined(RRD_EXPORT_DEPRECATED) */
#endif /* _RRDLIB_H */