diff --git a/src/rrd_open.c b/src/rrd_open.c
index 42426c6e092be4b3322274f5c72de7b15e3a7d9b..78d517458861a5fac58b5e9e9064fcf43f12e537 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_open.c Open an RRD File
*****************************************************************************
* $Id$
*****************************************************************************/
+#include "rrd_tool.h"
+#include "unused.h"
+
+#ifdef WIN32
#include <stdlib.h>
#include <fcntl.h>
#include <sys/stat.h>
+#endif
+
+
+#ifdef HAVE_BROKEN_MS_ASYNC
+#include <sys/types.h>
#include <utime.h>
+#endif
-#include "rrd_tool.h"
-#include "unused.h"
#define MEMBLK 8192
#ifdef WIN32
if (rdwr & RRD_CREAT) {
flags |= (O_CREAT | O_TRUNC);
}
+ if (rdwr & RRD_EXCL) {
+ flags |= O_EXCL;
+ }
}
if (rdwr & RRD_READAHEAD) {
#ifdef MAP_POPULATE
} else {
rrd_file->file_len = newfile_size;
lseek(rrd_simple_file->fd, newfile_size - 1, SEEK_SET);
- write(rrd_simple_file->fd, "\0", 1); /* poke */
+ if ( write(rrd_simple_file->fd, "\0", 1) == -1){ /* poke */
+ rrd_set_error("write '%s': %s", file_name, rrd_strerror(errno));
+ goto out_close;
+ }
lseek(rrd_simple_file->fd, 0, SEEK_SET);
}
#ifdef HAVE_POSIX_FADVISE
#ifdef USE_MADVISE
if (rdwr & RRD_COPY) {
/* We will read everything in a moment (copying) */
- madvise(data, rrd_file->file_len, MADV_WILLNEED | MADV_SEQUENTIAL);
+ madvise(data, rrd_file->file_len, MADV_WILLNEED );
+ madvise(data, rrd_file->file_len, MADV_SEQUENTIAL );
} else {
/* We do not need to read anything in for the moment */
madvise(data, rrd_file->file_len, MADV_RANDOM);
/* the stat_head will be needed soonish, so hint accordingly */
- madvise(data, sizeof(stat_head_t), MADV_WILLNEED | MADV_RANDOM);
+ madvise(data, sizeof(stat_head_t), MADV_WILLNEED);
+ madvise(data, sizeof(stat_head_t), MADV_RANDOM);
}
#endif
size_t dontneed_start;
size_t rra_start;
size_t active_block;
- unsigned long i;
+ size_t i;
ssize_t _page_size = sysconf(_SC_PAGESIZE);
if (rrd_file == NULL) {
}
+/* this is a leftover from the old days, it serves no purpose
+ and is therefore turned into a no-op */
+void rrd_flush(
+ rrd_file_t UNUSED(*rrd_file))
+{
+}
+
/* Initialize RRD header. */
void rrd_init(
* aligning RRAs within stripes, or other performance enhancements
*/
void rrd_notify_row(
- rrd_file_t *rrd_file __attribute__((unused)),
- int rra_idx __attribute__((unused)),
- unsigned long rra_row __attribute__((unused)),
- time_t rra_time __attribute__((unused)))
+ rrd_file_t UNUSED(*rrd_file),
+ int UNUSED(rra_idx),
+ unsigned long UNUSED(rra_row),
+ time_t UNUSED(rra_time))
{
}
* don't change to a new disk block at the same time
*/
unsigned long rrd_select_initial_row(
- rrd_file_t *rrd_file __attribute__((unused)),
- int rra_idx __attribute__((unused)),
+ rrd_file_t UNUSED(*rrd_file),
+ int UNUSED(rra_idx),
rra_def_t *rra
)
{