projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I realize now that the problem is the line
[rrdtool.git]
/
src
/
rrd.h
diff --git
a/src/rrd.h
b/src/rrd.h
index
a428370
..
b40251f
100644
(file)
--- a/
src/rrd.h
+++ b/
src/rrd.h
@@
-79,13
+79,22
@@
extern "C" {
/* information about an rrd file */
typedef struct rrd_file_t {
/* 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 */
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 */
+ void *pvt;
} rrd_file_t;
} 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 */
/* rrd info interface */
typedef struct rrd_blob_t {
unsigned long size; /* size of the blob */
@@
-171,13
+180,7
@@
extern "C" {
time_t rrd_last(
int,
char **);
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 **);
time_t rrd_first(
int,
char **);
@@
-198,6
+201,7
@@
extern "C" {
unsigned long *,
char ***,
rrd_value_t **);
unsigned long *,
char ***,
rrd_value_t **);
+ int rrd_cmd_flush (int argc, char **argv);
void rrd_freemem(
void *mem);
void rrd_freemem(
void *mem);
@@
-209,6
+213,8
@@
extern "C" {
time_t last_up,
int argc,
const char **argv);
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!!! */
/* NOTE: rrd_update_r are only thread-safe if no at-style time
specifications get used!!! */
@@
-217,20
+223,24
@@
extern "C" {
const char *_template,
int argc,
const char **argv);
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);
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);
time_t rrd_first_r(
const char *filename,
int rraindex);
@@
-368,6
+378,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 */