//#define ONE_PAGE 1
/* Avoid calling madvise on areas that were already hinted. May be benefical if
* your syscalls are very slow */
-//#define CHECK_MADVISE_OVERLAPS 1
+#define CHECK_MADVISE_OVERLAPS 1
#ifdef HAVE_MMAP
+/* the cast to void* is there to avoid this warning seen on ia64 with certain
+ versions of gcc: 'cast increases required alignment of target type'
+*/
#define __rrd_read(dst, dst_t, cnt) \
- (dst) = (dst_t*) (data + offset); \
+ (dst) = (dst_t*)(void*) (data + offset); \
offset += sizeof(dst_t) * (cnt)
#else
#define __rrd_read(dst, dst_t, cnt) \
if ((rrd_file->fd = open(file_name, flags, mode)) < 0) {
rrd_set_error("opening '%s': %s", file_name, rrd_strerror(errno));
- return NULL;
+ goto out_free;
}
/* Better try to avoid seeks as much as possible. stat may be heavy but
/* lets see if the first read worked */
if (data == MAP_FAILED) {
- rrd_set_error("error mmaping file '%s': %s", file_name,
+ rrd_set_error("mmaping file '%s': %s", file_name,
rrd_strerror(errno));
goto out_close;
}
_madvise(data, rrd_file->file_len, MADV_WILLNEED | MADV_SEQUENTIAL);
goto out_done;
}
+# ifndef ONE_PAGE
/* We do not need to read anything in for the moment */
-#ifndef ONE_PAGE
_madvise(data, rrd_file->file_len, MADV_DONTNEED);
-// _madvise(data, rrd_file->file_len, MADV_RANDOM);
-#else
-/* alternatively: keep 2 pages worth of data, likely headers,
+# else
+/* alternatively: keep 1 page worth of data, likely headers,
* don't need the rest. */
_madvise(data, _page_size, MADV_WILLNEED | MADV_SEQUENTIAL);
_madvise(data + _page_size, (rrd_file->file_len >= _page_size)
? rrd_file->file_len - _page_size : 0, MADV_DONTNEED);
-#endif
+# endif
#endif
#if defined USE_MADVISE && !defined ONE_PAGE
/* the stat_head will be needed soonish, so hint accordingly */
-// too finegrained to calc the individual sizes, just keep 2 pages worth of hdr
_madvise(data + PAGE_ALIGN_DOWN(offset), PAGE_ALIGN(sizeof(stat_head_t)),
- MADV_WILLNEED);
+ MADV_WILLNEED | MADV_RANDOM);
#endif
}
if (rrd->stat_head->float_cookie != FLOAT_COOKIE) {
- rrd_set_error("This RRD was created on other architecture");
+ rrd_set_error("This RRD was created on another architecture");
goto out_nullify_head;
}
rrd->stat_head = NULL;
out_close:
close(rrd_file->fd);
+ out_free:
+ free(rrd_file);
return NULL;
}
#endif /* DEBUG */
#ifdef USE_MADVISE
-#ifdef ONE_PAGE
+# ifdef ONE_PAGE
/* Keep headers around, round up to next page boundary. */
ret =
PAGE_ALIGN(rrd_file->header_len % _page_size + rrd_file->header_len);
if (rrd_file->file_len > ret)
_madvise(rrd_file->file_start + ret,
rrd_file->file_len - ret, MADV_DONTNEED);
-#else
+# else
/* ignoring errors from RRDs that are smaller then the file_len+rounding */
_madvise(rrd_file->file_start + PAGE_ALIGN_DOWN(rrd_file->header_len),
rrd_file->file_len - PAGE_ALIGN(rrd_file->header_len),
MADV_DONTNEED);
-#endif
+# endif
#endif
#ifdef HAVE_MMAP
ret = munmap(rrd_file->file_start, rrd_file->file_len);
/* Get current position in rrd_file. */
-inline off_t rrd_tell(rrd_file_t *rrd_file)
+inline off_t rrd_tell(
+ rrd_file_t *rrd_file)
{
return rrd_file->pos;
}
/* read count bytes into buffer buf, starting at rrd_file->pos.
* Returns the number of bytes read. */
-ssize_t rrd_read(
+inline ssize_t rrd_read(
rrd_file_t *rrd_file,
void *buf,
size_t count)
{
#ifdef HAVE_MMAP
- buf = memmove(buf, rrd_file->file_start + rrd_file->pos, count);
+ buf = memcpy(buf, rrd_file->file_start + rrd_file->pos, count);
rrd_file->pos += count; /* mimmic read() semantics */
return count;
#else
* rrd_file->pos of rrd_file->fd.
* Returns the number of bytes written. */
-ssize_t rrd_write(
+inline ssize_t rrd_write(
rrd_file_t *rrd_file,
const void *buf,
size_t count)
{
#ifdef HAVE_MMAP
- memmove(rrd_file->file_start + rrd_file->pos, buf, count);
+ memcpy(rrd_file->file_start + rrd_file->pos, buf, count);
+ rrd_file->pos += count;
return count; /* mimmic write() semantics */
#else
- return write(rrd_file->fd, buf, count);
+ ssize_t _sz = write(rrd_file->fd, buf, count);
+ if (_sz > 0)
+ rrd_file->pos += _sz;
+ return _sz;
#endif
}
#ifdef HAVE_MMAP
inline void rrd_free(
- rrd_t UNUSED(*rrd)) {}
+ rrd_t UNUSED(*rrd))
+{
+}
#else
void rrd_free(
rrd_t *rrd)