X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_open.c;h=c986f750beca7bec9fb3f0cba5c5a488cfda17d2;hp=7b1a0f1da50f333cc570ef27c5d3821e3c6b0700;hb=009ac7ac9dde1ba7c450b230b9118cff2cedc9f6;hpb=5e060d8a49301fee5681969c8771473dd024cb98 diff --git a/src/rrd_open.c b/src/rrd_open.c index 7b1a0f1..c986f75 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.6 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_open.c Open an RRD File ***************************************************************************** @@ -63,103 +63,463 @@ *****************************************************************************/ #include "rrd_tool.h" +#include "unused.h" #define MEMBLK 8192 -/* open a database file, return its header and a open filehandle */ +/* DEBUG 2 prints information obtained via mincore(2) */ +// #define DEBUG 2 +/* do not calculate exact madvise hints but assume 2 pages for headers and + * set DONTNEED for the rest, which is assumed to be data */ +//#define TWO_PAGES 1 +/* Avoid calling madvise on areas that were already hinted. May be benefical if + * your syscalls are very slow */ +//#define CHECK_MADVISE_OVERLAPS 1 + +#ifdef HAVE_MMAP +#define __rrd_read(dst, dst_t, cnt) \ + (dst) = (dst_t*) (data + offset); \ + offset += sizeof(dst_t) * (cnt) +#else +#define __rrd_read(dst, dst_t, cnt) \ + if ((dst = malloc(sizeof(dst_t)*(cnt))) == NULL) { \ + rrd_set_error(#dst " malloc"); \ + goto out_nullify_head; \ + } \ + offset += read (rrd_file->fd, dst, sizeof(dst_t)*(cnt)) +#endif + +/* next page-aligned (i.e. page-align up) */ +#ifndef PAGE_ALIGN +#define PAGE_ALIGN(addr) (((addr)+_page_size-1)&(~(_page_size-1))) +#endif +/* previous page-aligned (i.e. page-align down) */ +#ifndef PAGE_ALIGN_DOWN +#define PAGE_ALIGN_DOWN(addr) (((addr)+_page_size-1)&(~(_page_size-1))) +#endif + +#ifdef HAVE_MMAP +/* vector of last madvise hint */ +typedef struct _madvise_vec_t { + void *start; + ssize_t length; +} _madvise_vec_t; +_madvise_vec_t _madv_vec = { NULL, 0 }; +#endif + +#if defined CHECK_MADVISE_OVERLAPS +#define _madvise(_start, _off, _hint) \ + if ((_start) != _madv_vec.start && (ssize_t)(_off) != _madv_vec.length) { \ + _madv_vec.start = (_start) ; _madv_vec.length = (_off); \ + madvise((_start), (_off), (_hint)); \ + } +#else +#define _madvise(_start, _off, _hint) \ + madvise((_start), (_off), (_hint)) +#endif + +/* open a database file, return its header and an open filehandle */ /* positioned to the first cdp in the first rra */ -int -rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) +rrd_file_t *rrd_open( + const char *const file_name, + rrd_t *rrd, + unsigned rdwr) { + int flags = 0; + mode_t mode = S_IRUSR; + int version; - - char *mode = NULL; - int version; - +#ifdef HAVE_MMAP + ssize_t _page_size = sysconf(_SC_PAGESIZE); + int mm_prot = PROT_READ, mm_flags = 0; + char *data; +#endif + off_t offset = 0; + struct stat statb; + rrd_file_t *rrd_file = malloc(sizeof(rrd_file_t)); + + if (rrd_file == NULL) { + rrd_set_error("allocating rrd_file descriptor for '%s'", file_name); + return NULL; + } + memset(rrd_file, 0, sizeof(rrd_file_t)); rrd_init(rrd); - if (rdwr == RRD_READONLY) { - mode = "rb"; +#ifdef DEBUG + if ((rdwr & (RRD_READONLY | RRD_READWRITE)) == + (RRD_READONLY | RRD_READWRITE)) { + /* Both READONLY and READWRITE were given, which is invalid. */ + rrd_set_error("in read/write request mask"); + exit(-1); + } +#endif + if (rdwr & RRD_READONLY) { + flags |= O_RDONLY; +#ifdef HAVE_MMAP + mm_flags = MAP_PRIVATE; +# ifdef MAP_NORESERVE + mm_flags |= MAP_NORESERVE; /* readonly, so no swap backing needed */ +# endif +#endif } else { - mode = "rb+"; + if (rdwr & RRD_READWRITE) { + mode |= S_IWUSR; + flags |= O_RDWR; +#ifdef HAVE_MMAP + mm_flags = MAP_SHARED; + mm_prot |= PROT_WRITE; +#endif + } + if (rdwr & RRD_CREAT) { + flags |= (O_CREAT | O_TRUNC); + } + } + if (rdwr & RRD_READAHEAD) { +#ifdef MAP_POPULATE + mm_flags |= MAP_POPULATE; /* populate ptes and data */ +#endif +#if defined MAP_NONBLOCK + mm_flags |= MAP_NONBLOCK; /* just populate ptes */ +#endif +#ifdef USE_DIRECT_IO + } else { + flags |= O_DIRECT; +#endif + } +#ifdef O_NONBLOCK + flags |= O_NONBLOCK; +#endif + + if ((rrd_file->fd = open(file_name, flags, mode)) < 0) { + rrd_set_error("opening '%s': %s", file_name, rrd_strerror(errno)); + return NULL; + } + + /* Better try to avoid seeks as much as possible. stat may be heavy but + * many concurrent seeks are even worse. */ + if ((fstat(rrd_file->fd, &statb)) < 0) { + rrd_set_error("fstat '%s': %s", file_name, rrd_strerror(errno)); + goto out_close; } - - if (((*in_file) = fopen(file_name,mode)) == NULL ){ - rrd_set_error("opening '%s': %s",file_name, rrd_strerror(errno)); - return (-1); + rrd_file->file_len = statb.st_size; + +#ifdef HAVE_POSIX_FADVISE + /* In general we need no read-ahead when dealing with rrd_files. + When we stop reading, it is highly unlikely that we start up again. + In this manner we actually save time and diskaccess (and buffer cache). + Thanks to Dave Plonka for the Idea of using POSIX_FADV_RANDOM here. */ + if (0 != posix_fadvise(rrd_file->fd, 0, 0, POSIX_FADV_RANDOM)) { + rrd_set_error("setting POSIX_FADV_RANDOM on '%s': %s", file_name, + rrd_strerror(errno)); + goto out_close; } +#endif + /* - if (rdwr == RRD_READWRITE) - { - if (setvbuf((*in_file),NULL,_IONBF,2)) { - rrd_set_error("failed to disable the stream buffer\n"); - return (-1); - } - } + if (rdwr & RRD_READWRITE) + { + if (setvbuf((rrd_file->fd),NULL,_IONBF,2)) { + rrd_set_error("failed to disable the stream buffer\n"); + return (-1); + } + } */ - -#define MYFREAD(MYVAR,MYVART,MYCNT) \ - if ((MYVAR = malloc(sizeof(MYVART) * MYCNT)) == NULL) {\ - rrd_set_error("" #MYVAR " malloc"); \ - fclose(*in_file); \ - return (-1); } \ - fread(MYVAR,sizeof(MYVART),MYCNT, *in_file); - +#ifdef HAVE_MMAP + data = mmap(0, rrd_file->file_len, mm_prot, mm_flags, + rrd_file->fd, offset); - MYFREAD(rrd->stat_head, stat_head_t, 1) /* lets see if the first read worked */ - if (ferror( *in_file )){ - rrd_set_error("reading the cookie off %s faild",file_name); - fclose(*in_file); - return(-1); - } + if (data == MAP_FAILED) { + rrd_set_error("error mmaping file '%s': %s", file_name, + rrd_strerror(errno)); + goto out_close; + } + rrd_file->file_start = data; +#endif +#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); + goto out_done; + } + /* We do not need to read anything in for the moment */ +#ifndef TWO_PAGES + _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, + * don't need the rest. */ + _madvise(data, _page_size * 2, MADV_WILLNEED | MADV_SEQUENTIAL); + _madvise(data + _page_size * 2, (rrd_file->file_len >= _page_size * 2) + ? rrd_file->file_len - _page_size * 2 : 0, MADV_DONTNEED); +#endif +#endif + +#if defined USE_MADVISE && !defined TWO_PAGES + /* 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); + +#endif + + __rrd_read(rrd->stat_head, stat_head_t, + 1); + + /* lets do some test if we are on track ... */ + if (memcmp(rrd->stat_head->cookie, RRD_COOKIE, sizeof(RRD_COOKIE)) != 0) { + rrd_set_error("'%s' is not an RRD file", file_name); + goto out_nullify_head; + } + + if (rrd->stat_head->float_cookie != FLOAT_COOKIE) { + rrd_set_error("This RRD was created on other architecture"); + goto out_nullify_head; + } + version = atoi(rrd->stat_head->version); - /* lets do some test if we are on track ... */ - if (strncmp(rrd->stat_head->cookie,RRD_COOKIE,4) != 0){ - rrd_set_error("'%s' is not an RRD file",file_name); - free(rrd->stat_head); - fclose(*in_file); - return(-1);} - - if (version > atoi(RRD_VERSION)){ - rrd_set_error("can't handle RRD file version %s", - rrd->stat_head->version); - free(rrd->stat_head); - fclose(*in_file); - return(-1);} - - if (rrd->stat_head->float_cookie != FLOAT_COOKIE){ - rrd_set_error("This RRD was created on other architecture"); - free(rrd->stat_head); - fclose(*in_file); - return(-1);} - - MYFREAD(rrd->ds_def, ds_def_t, rrd->stat_head->ds_cnt) - MYFREAD(rrd->rra_def, rra_def_t, rrd->stat_head->rra_cnt) + if (version > atoi(RRD_VERSION)) { + rrd_set_error("can't handle RRD file version %s", + rrd->stat_head->version); + goto out_nullify_head; + } +#if defined USE_MADVISE && !defined TWO_PAGES + /* the ds_def will be needed soonish, so hint accordingly */ + _madvise(data + PAGE_ALIGN_DOWN(offset), + PAGE_ALIGN(sizeof(ds_def_t) * rrd->stat_head->ds_cnt), + MADV_WILLNEED); +#endif + __rrd_read(rrd->ds_def, ds_def_t, + rrd->stat_head->ds_cnt); + +#if defined USE_MADVISE && !defined TWO_PAGES + /* the rra_def will be needed soonish, so hint accordingly */ + _madvise(data + PAGE_ALIGN_DOWN(offset), + PAGE_ALIGN(sizeof(rra_def_t) * rrd->stat_head->rra_cnt), + MADV_WILLNEED); +#endif + __rrd_read(rrd->rra_def, rra_def_t, + rrd->stat_head->rra_cnt); + /* handle different format for the live_head */ - if(version < 3) { - rrd->live_head = (live_head_t *)malloc(sizeof(live_head_t)); - if(rrd->live_head == NULL) { - rrd_set_error("live_head_t malloc"); - fclose(*in_file); - return (-1); - } - fread(&rrd->live_head->last_up, sizeof(long), 1, *in_file); - rrd->live_head->last_up_usec = 0; - } - else { - MYFREAD(rrd->live_head, live_head_t, 1) - } - MYFREAD(rrd->pdp_prep, pdp_prep_t, rrd->stat_head->ds_cnt) - MYFREAD(rrd->cdp_prep, cdp_prep_t, (rrd->stat_head->rra_cnt - * rrd->stat_head->ds_cnt)) - MYFREAD(rrd->rra_ptr, rra_ptr_t, rrd->stat_head->rra_cnt) -#undef MYFREAD - - return(0); + if (version < 3) { + rrd->live_head = (live_head_t *) malloc(sizeof(live_head_t)); + if (rrd->live_head == NULL) { + rrd_set_error("live_head_t malloc"); + goto out_close; + } +#ifdef HAVE_MMAP + memmove(&rrd->live_head->last_up, data + offset, sizeof(long)); + offset += sizeof(long); +#else + offset += read(rrd_file->fd, &rrd->live_head->last_up, sizeof(long)); +#endif + rrd->live_head->last_up_usec = 0; + } else { +#if defined USE_MADVISE && !defined TWO_PAGES + /* the live_head will be needed soonish, so hint accordingly */ + _madvise(data + PAGE_ALIGN_DOWN(offset), + PAGE_ALIGN(sizeof(live_head_t)), MADV_WILLNEED); +#endif + __rrd_read(rrd->live_head, live_head_t, + 1); + } +//XXX: This doesn't look like it needs madvise + __rrd_read(rrd->pdp_prep, pdp_prep_t, + rrd->stat_head->ds_cnt); + +//XXX: This could benefit from madvise()ing + __rrd_read(rrd->cdp_prep, cdp_prep_t, + rrd->stat_head->rra_cnt * rrd->stat_head->ds_cnt); + +//XXX: This could benefit from madvise()ing + __rrd_read(rrd->rra_ptr, rra_ptr_t, + rrd->stat_head->rra_cnt); + +#ifdef USE_MADVISE + out_done: +#endif + rrd_file->header_len = offset; + rrd_file->pos = offset; + + return (rrd_file); + out_nullify_head: + rrd->stat_head = NULL; + out_close: + close(rrd_file->fd); + return NULL; +} + + +/* Close a reference to an rrd_file. */ + +int rrd_close( + rrd_file_t *rrd_file) +{ + int ret; + +#if defined HAVE_MMAP + ssize_t _page_size = sysconf(_SC_PAGESIZE); +#endif +#if defined DEBUG && DEBUG > 1 + /* pretty print blocks in core */ + off_t off; + unsigned char *vec; + + off = + rrd_file->file_len + + ((rrd_file->file_len + sysconf(_SC_PAGESIZE) - + 1) / sysconf(_SC_PAGESIZE)); + vec = malloc(off); + if (vec != NULL) { + memset(vec, 0, off); + if (mincore(rrd_file->file_start, rrd_file->file_len, vec) == 0) { + int prev; + unsigned is_in = 0, was_in = 0; + + for (off = 0, prev = 0; off < rrd_file->file_len; ++off) { + is_in = vec[off] & 1; /* if lsb set then is core resident */ + if (off == 0) + was_in = is_in; + if (was_in != is_in) { + fprintf(stderr, "%sin core: %p len %ld\n", + was_in ? "" : "not ", vec + prev, off - prev); + was_in = is_in; + prev = off; + } + } + fprintf(stderr, + "%sin core: %p len %ld\n", + was_in ? "" : "not ", vec + prev, off - prev); + } else + fprintf(stderr, "mincore: %s", rrd_strerror(errno)); + } +#endif /* DEBUG */ + +#ifdef USE_MADVISE +#ifdef TWO_PAGES +//XXX: ? + /* Keep 2 pages worth of 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 + /* 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 +#ifdef HAVE_MMAP + ret = munmap(rrd_file->file_start, rrd_file->file_len); + if (ret != 0) + rrd_set_error("munmap rrd_file: %s", rrd_strerror(errno)); +#else + ret = 0; +#endif +// ret = close(rrd_file->fd); +// if (ret != 0) +// rrd_set_error("closing file: %s", rrd_strerror(errno)); + free(rrd_file); + rrd_file = NULL; + return ret; +} + + +/* Set position of rrd_file. */ + +off_t rrd_seek( + rrd_file_t *rrd_file, + off_t off, + int whence) +{ + off_t ret = 0; + +#ifdef HAVE_MMAP + if (whence == SEEK_SET) + rrd_file->pos = off; + else if (whence == SEEK_CUR) + rrd_file->pos += off; + else if (whence == SEEK_END) + rrd_file->pos = rrd_file->file_len + off; +#else + ret = lseek(rrd_file->fd, off, whence); + if (ret < 0) + rrd_set_error("lseek: %s", rrd_strerror(errno)); + rrd_file->pos = ret; +#endif +//XXX: mimic fseek, which returns 0 upon success + return ret == -1; //XXX: or just ret to mimic lseek +} + + +/* Get current position in rrd_file. */ + +inline off_t rrd_tell(rrd_file_t *rrd_file) +{ + return rrd_file->pos; } -void rrd_init(rrd_t *rrd) + +/* read count bytes into buffer buf, starting at rrd_file->pos. + * Returns the number of bytes read. */ + +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); + rrd_file->pos += count; /* mimmic read() semantics */ + return count; +#else + ssize_t ret; + + ret = read(rrd_file->fd, buf, count); + //XXX: eventually add generic rrd_set_error(""); here + rrd_file->pos += count; /* mimmic read() semantics */ + return ret; +#endif +} + + +/* write count bytes from buffer buf to the current position + * rrd_file->pos of rrd_file->fd. + * Returns the number of bytes written. */ + +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); + return count; /* mimmic write() semantics */ +#else + return write(rrd_file->fd, buf, count); +#endif +} + + +/* flush all data pending to be written to FD. */ + +inline void rrd_flush( + rrd_file_t *rrd_file) +{ + if (fdatasync(rrd_file->fd) != 0) { + rrd_set_error("flushing fd %d: %s", rrd_file->fd, + rrd_strerror(errno)); + } +} + + +/* Initialize RRD header. */ + +void rrd_init( + rrd_t *rrd) { rrd->stat_head = NULL; rrd->ds_def = NULL; @@ -171,66 +531,92 @@ void rrd_init(rrd_t *rrd) rrd->rrd_value = NULL; } -void rrd_free(rrd_t *rrd) + +/* free RRD header data. */ + +void rrd_free( + rrd_t UNUSED(*rrd)) { - if (rrd->stat_head) free(rrd->stat_head); - if (rrd->ds_def) free(rrd->ds_def); - if (rrd->rra_def) free(rrd->rra_def); - if (rrd->live_head) free(rrd->live_head); - if (rrd->rra_ptr) free(rrd->rra_ptr); - if (rrd->pdp_prep) free(rrd->pdp_prep); - if (rrd->cdp_prep) free(rrd->cdp_prep); - if (rrd->rrd_value) free(rrd->rrd_value); +#ifndef HAVE_MMAP + if (atoi(rrd->stat_head->version) < 3) + free(rrd->live_head); + free(rrd->stat_head); + free(rrd->ds_def); + free(rrd->rra_def); + free(rrd->rra_ptr); + free(rrd->pdp_prep); + free(rrd->cdp_prep); + free(rrd->rrd_value); +#endif } + /* routine used by external libraries to free memory allocated by * rrd library */ -void rrd_freemem(void *mem) -{ - if (mem) free(mem); +void rrd_freemem( + void *mem) +{ + free(mem); } -int readfile(const char *file_name, char **buffer, int skipfirst){ - long writecnt=0,totalcnt = MEMBLK; - long offset = 0; - FILE *input=NULL; - char c ; - if ((strcmp("-",file_name) == 0)) { input = stdin; } - else { - if ((input = fopen(file_name,"rb")) == NULL ){ - rrd_set_error("opening '%s': %s",file_name,rrd_strerror(errno)); - return (-1); - } - } - if (skipfirst){ - do { c = getc(input); offset++; } while (c != '\n' && ! feof(input)); - } - if (strcmp("-",file_name)) { - fseek(input, 0, SEEK_END); - /* have extra space for detecting EOF without realloc */ - totalcnt = (ftell(input) + 1) / sizeof(char) - offset; - if (totalcnt < MEMBLK) - totalcnt = MEMBLK; /* sanitize */ - fseek(input, offset * sizeof(char), SEEK_SET); - } - if (((*buffer) = (char *) malloc((totalcnt+4) * sizeof(char))) == NULL) { - perror("Allocate Buffer:"); - exit(1); + +/* XXX: FIXME: missing documentation. */ +/*XXX: FIXME should be renamed to rrd_readfile or _rrd_readfile */ + +int /*_rrd_*/ readfile( + const char *file_name, + char **buffer, + int skipfirst) +{ + long writecnt = 0, totalcnt = MEMBLK; + long offset = 0; + FILE *input = NULL; + char c; + + if ((strcmp("-", file_name) == 0)) { + input = stdin; + } else { + if ((input = fopen(file_name, "rb")) == NULL) { + rrd_set_error("opening '%s': %s", file_name, rrd_strerror(errno)); + return (-1); + } + } + if (skipfirst) { + do { + c = getc(input); + offset++; + } while (c != '\n' && !feof(input)); + } + if (strcmp("-", file_name)) { + fseek(input, 0, SEEK_END); + /* have extra space for detecting EOF without realloc */ + totalcnt = (ftell(input) + 1) / sizeof(char) - offset; + if (totalcnt < MEMBLK) + totalcnt = MEMBLK; /* sanitize */ + fseek(input, offset * sizeof(char), SEEK_SET); + } + if (((*buffer) = (char *) malloc((totalcnt + 4) * sizeof(char))) == NULL) { + perror("Allocate Buffer:"); + exit(1); }; - do{ - writecnt += fread((*buffer)+writecnt, 1, (totalcnt - writecnt) * sizeof(char),input); - if (writecnt >= totalcnt){ - totalcnt += MEMBLK; - if (((*buffer)=rrd_realloc((*buffer), (totalcnt+4) * sizeof(char)))==NULL){ - perror("Realloc Buffer:"); - exit(1); - }; - } - } while (! feof(input)); + do { + writecnt += + fread((*buffer) + writecnt, 1, + (totalcnt - writecnt) * sizeof(char), input); + if (writecnt >= totalcnt) { + totalcnt += MEMBLK; + if (((*buffer) = + rrd_realloc((*buffer), + (totalcnt + 4) * sizeof(char))) == NULL) { + perror("Realloc Buffer:"); + exit(1); + }; + } + } while (!feof(input)); (*buffer)[writecnt] = '\0'; - if (strcmp("-",file_name) != 0) {fclose(input);}; + if (strcmp("-", file_name) != 0) { + fclose(input); + }; return writecnt; } - -