/*****************************************************************************
- * RRDtool 1.4.1 Copyright by Tobi Oetiker, 1997-2009
+ * 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_READONLY) {
flags |= O_RDONLY;
#ifdef HAVE_MMAP
+# if !defined(AIX)
rrd_simple_file->mm_flags = MAP_PRIVATE;
+# endif
# ifdef MAP_NORESERVE
rrd_simple_file->mm_flags |= MAP_NORESERVE; /* readonly, so no swap backing needed */
# endif
if (rdwr & RRD_CREAT) {
flags |= (O_CREAT | O_TRUNC);
}
+ if (rdwr & RRD_EXCL) {
+ flags |= O_EXCL;
+ }
}
if (rdwr & RRD_READAHEAD) {
#ifdef MAP_POPULATE
if((rrd_file->pos + count) > old_size)
{
- rrd_set_error("attempting to write beyond end of file");
+ rrd_set_error("attempting to write beyond end of file (%ld + %ld > %ld)",rrd_file->pos, count, old_size);
return -1;
}
memcpy(rrd_simple_file->file_start + rrd_file->pos, buf, count);
/* 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 *rrd_file __attribute__((unused)))
+ rrd_file_t UNUSED(*rrd_file))
{
}
* 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
)
{