X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=d701204b4a492994423a27d9a117806f567614e1;hb=1e491ed6d54facbe59e9a6f370af8aec200098b7;hp=c986f750beca7bec9fb3f0cba5c5a488cfda17d2;hpb=009ac7ac9dde1ba7c450b230b9118cff2cedc9f6;p=rrdtool.git diff --git a/src/rrd_open.c b/src/rrd_open.c index c986f75..d701204 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -4,62 +4,6 @@ * rrd_open.c Open an RRD File ***************************************************************************** * $Id$ - * $Log$ - * Revision 1.10 2004/05/26 22:11:12 oetiker - * reduce compiler warnings. Many small fixes. -- Mike Slifcak - * - * Revision 1.9 2003/04/29 21:56:49 oetiker - * readline in rrd_open.c reads the file in 8 KB blocks, and calls realloc for - * each block. realloc is very slow in Mac OS X for huge blocks, e.g. when - * restoring databases from huge xml files. This patch finds the size of the - * file, and starts out with malloc'ing the full size. - * -- Peter Speck - * - * Revision 1.8 2003/04/11 19:43:44 oetiker - * New special value COUNT which allows calculations based on the position of a - * value within a data set. Bug fix in rrd_rpncalc.c. PREV returned erroneus - * value for the second value. Bug fix in rrd_restore.c. Bug causing seek error - * when accesing an RRD restored from an xml that holds an RRD version <3. - * -- Ruben Justo - * - * Revision 1.7 2003/03/31 21:22:12 oetiker - * enables RRDtool updates with microsecond or in case of windows millisecond - * precision. This is needed to reduce time measurement error when archive step - * is small. (<30s) -- Sasha Mikheev - * - * Revision 1.6 2003/02/13 07:05:27 oetiker - * Find attached the patch I promised to send to you. Please note that there - * are three new source files (src/rrd_is_thread_safe.h, src/rrd_thread_safe.c - * and src/rrd_not_thread_safe.c) and the introduction of librrd_th. This - * library is identical to librrd, but it contains support code for per-thread - * global variables currently used for error information only. This is similar - * to how errno per-thread variables are implemented. librrd_th must be linked - * alongside of libpthred - * - * There is also a new file "THREADS", holding some documentation. - * - * -- Peter Stamfest - * - * Revision 1.5 2002/06/20 00:21:03 jake - * More Win32 build changes; thanks to Kerry Calvert. - * - * Revision 1.4 2002/02/01 20:34:49 oetiker - * fixed version number and date/time - * - * Revision 1.3 2001/03/04 13:01:55 oetiker - * Aberrant Behavior Detection support. A brief overview added to rrdtool.pod. - * Major updates to rrd_update.c, rrd_create.c. Minor update to other core files. - * This is backwards compatible! But new files using the Aberrant stuff are not readable - * by old rrdtool versions. See http://cricket.sourceforge.net/aberrant/rrd_hw.htm - * -- Jake Brutlag - * - * Revision 1.2 2001/03/04 10:29:20 oetiker - * fixed filedescriptor leak - * -- Mike Franusich - * - * Revision 1.1.1.1 2001/02/25 22:25:05 oetiker - * checkin - * *****************************************************************************/ #include "rrd_tool.h" @@ -67,17 +11,20 @@ #define MEMBLK 8192 /* DEBUG 2 prints information obtained via mincore(2) */ -// #define DEBUG 2 -/* do not calculate exact madvise hints but assume 2 pages for headers and +//#define DEBUG 2 +/* do not calculate exact madvise hints but assume 1 page for headers and * set DONTNEED for the rest, which is assumed to be data */ -//#define TWO_PAGES 1 +//#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) \ @@ -88,13 +35,9 @@ 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))) +/* get the address of the start of this page */ +#ifndef PAGE_START +#define PAGE_START(addr) ((addr)&(~(_page_size-1))) #endif #ifdef HAVE_MMAP @@ -117,8 +60,11 @@ _madvise_vec_t _madv_vec = { NULL, 0 }; 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 */ +/* Open a database file, return its header and an open filehandle, + * positioned to the first cdp in the first rra. + * In the error path of rrd_open, only rrd_free(&rrd) has to be called + * before returning an error. Do not call rrd_close upon failure of rrd_open. + */ rrd_file_t *rrd_open( const char *const file_name, @@ -136,14 +82,23 @@ rrd_file_t *rrd_open( #endif off_t offset = 0; struct stat statb; - rrd_file_t *rrd_file = malloc(sizeof(rrd_file_t)); - + rrd_file_t *rrd_file = NULL; + off_t newfile_size = 0; + + if (rdwr & RRD_CREAT) { + /* yes bad inline signaling alert, we are using the + floatcookie to pass the size in ... only used in resize */ + newfile_size = (off_t) rrd->stat_head->float_cookie; + free(rrd->stat_head); + } + rrd_init(rrd); + 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); + #ifdef DEBUG if ((rdwr & (RRD_READONLY | RRD_READWRITE)) == (RRD_READONLY | RRD_READWRITE)) { @@ -191,17 +146,23 @@ rrd_file_t *rrd_open( 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 * many concurrent seeks are even worse. */ - if ((fstat(rrd_file->fd, &statb)) < 0) { + if (newfile_size == 0 && ((fstat(rrd_file->fd, &statb)) < 0)) { rrd_set_error("fstat '%s': %s", file_name, rrd_strerror(errno)); goto out_close; } - rrd_file->file_len = statb.st_size; - + if (newfile_size == 0) { + rrd_file->file_len = statb.st_size; + } else { + rrd_file->file_len = newfile_size; + lseek(rrd_file->fd, newfile_size - 1, SEEK_SET); + write(rrd_file->fd, "\0", 1); /* poke */ + lseek(rrd_file->fd, 0, SEEK_SET); + } #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. @@ -229,37 +190,37 @@ rrd_file_t *rrd_open( /* 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; } rrd_file->file_start = data; + if (rdwr & RRD_CREAT) { + memset(data, DNAN, newfile_size - 1); + goto out_done; + } #endif + if (rdwr & RRD_CREAT) + goto out_done; #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, + } else { +# ifndef ONE_PAGE + /* 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); + +# else +/* alternatively: keep 1 page 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); - + _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 __rrd_read(rrd->stat_head, stat_head_t, @@ -272,7 +233,7 @@ rrd_file_t *rrd_open( } 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; } @@ -283,19 +244,19 @@ rrd_file_t *rrd_open( rrd->stat_head->version); goto out_nullify_head; } -#if defined USE_MADVISE && !defined TWO_PAGES +#if defined USE_MADVISE && !defined ONE_PAGE /* 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), + _madvise(data + PAGE_START(offset), + 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 +#if defined USE_MADVISE && !defined ONE_PAGE /* 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), + _madvise(data + PAGE_START(offset), + sizeof(rra_def_t) * rrd->stat_head->rra_cnt, MADV_WILLNEED); #endif __rrd_read(rrd->rra_def, rra_def_t, @@ -316,10 +277,10 @@ rrd_file_t *rrd_open( #endif rrd->live_head->last_up_usec = 0; } else { -#if defined USE_MADVISE && !defined TWO_PAGES +#if defined USE_MADVISE && !defined ONE_PAGE /* the live_head will be needed soonish, so hint accordingly */ - _madvise(data + PAGE_ALIGN_DOWN(offset), - PAGE_ALIGN(sizeof(live_head_t)), MADV_WILLNEED); + _madvise(data + PAGE_START(offset), + sizeof(live_head_t), MADV_WILLNEED); #endif __rrd_read(rrd->live_head, live_head_t, 1); @@ -336,40 +297,31 @@ rrd_file_t *rrd_open( __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; - + out_done: return (rrd_file); out_nullify_head: rrd->stat_head = NULL; out_close: close(rrd_file->fd); + out_free: + free(rrd_file); 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 +static +void mincore_print(rrd_file_t *rrd_file,char * mark){ +#ifdef HAVE_MMAP /* pretty print blocks in core */ off_t off; unsigned char *vec; + ssize_t _page_size = sysconf(_SC_PAGESIZE); - off = - rrd_file->file_len + - ((rrd_file->file_len + sysconf(_SC_PAGESIZE) - - 1) / sysconf(_SC_PAGESIZE)); + off = rrd_file->file_len + + ((rrd_file->file_len + _page_size - 1) / _page_size); vec = malloc(off); if (vec != NULL) { memset(vec, 0, off); @@ -382,46 +334,87 @@ int rrd_close( if (off == 0) was_in = is_in; if (was_in != is_in) { - fprintf(stderr, "%sin core: %p len %ld\n", + fprintf(stderr, "%s: %sin core: %p len %ld\n",mark, was_in ? "" : "not ", vec + prev, off - prev); was_in = is_in; prev = off; } } fprintf(stderr, - "%sin core: %p len %ld\n", + "%s: %sin core: %p len %ld\n", mark, 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 + fprintf(stderr, "sorry mincore only works with mmap"); +#endif +} + + +/* drop cache except for the header and the active pages */ +void +rrd_dontneed ( + rrd_file_t *rrd_file, + rrd_t *rrd){ + unsigned long dontneed_start; + unsigned long rra_start; + unsigned long active_block; + unsigned long i; + ssize_t _page_size = sysconf(_SC_PAGESIZE); + +#if defined DEBUG && DEBUG > 1 + mincore_print(rrd_file,"before"); +#endif + /* 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), + rra_start = rrd_file->header_len; + dontneed_start = PAGE_START(rra_start)+_page_size; + for (i = 0; i < rrd->stat_head->rra_cnt; ++i) { + active_block = + PAGE_START(rra_start + + rrd->rra_ptr[i].cur_row + * rrd->stat_head->ds_cnt + * sizeof(rrd_value_t)); + if (active_block > dontneed_start){ +#ifdef USE_MADVISE + _madvise(rrd_file->file_start + dontneed_start, + active_block-dontneed_start-1, + MADV_DONTNEED); +#endif +/* in linux at least only fadvise DONTNEED seems to purge pages from cache */ +#ifdef HAVE_POSIX_FADVISE + posix_fadvise(rrd_file->fd, dontneed_start, active_block-dontneed_start-1, POSIX_FADV_DONTNEED); +#endif + } + dontneed_start = active_block + _page_size; + rra_start += rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt * sizeof(rrd_value_t); + } +#ifdef USE_MADVISE + _madvise(rrd_file->file_start + dontneed_start, + rrd_file->file_len - dontneed_start, MADV_DONTNEED); #endif +#ifdef HAVE_POSIX_FADVISE + posix_fadvise(rrd_file->fd, dontneed_start, rrd_file->file_len-dontneed_start, POSIX_FADV_DONTNEED); #endif +#if defined DEBUG && DEBUG > 1 + mincore_print(rrd_file,"after"); +#endif +} + +int rrd_close( + rrd_file_t *rrd_file) +{ + int ret; #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)); + 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; @@ -457,30 +450,40 @@ off_t rrd_seek( /* 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. */ + * Returns the number of bytes read or <0 on error. */ -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); - rrd_file->pos += count; /* mimmic read() semantics */ - return count; + size_t _cnt = count; + ssize_t _surplus = rrd_file->pos + _cnt - rrd_file->file_len; + + if (_surplus > 0) { /* short read */ + _cnt -= _surplus; + } + if (_cnt == 0) + return 0; /* EOF */ + buf = memcpy(buf, rrd_file->file_start + rrd_file->pos, _cnt); + + rrd_file->pos += _cnt; /* mimmic read() semantics */ + return _cnt; #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 */ + if (ret > 0) + rrd_file->pos += ret; /* mimmic read() semantics */ return ret; #endif } @@ -490,16 +493,21 @@ ssize_t rrd_read( * 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 } @@ -534,12 +542,16 @@ void rrd_init( /* free RRD header data. */ -void rrd_free( +#ifdef HAVE_MMAP +inline void rrd_free( rrd_t UNUSED(*rrd)) { -#ifndef HAVE_MMAP - if (atoi(rrd->stat_head->version) < 3) - free(rrd->live_head); +} +#else +void rrd_free( + rrd_t *rrd) +{ + free(rrd->live_head); free(rrd->stat_head); free(rrd->ds_def); free(rrd->rra_def); @@ -547,8 +559,8 @@ void rrd_free( free(rrd->pdp_prep); free(rrd->cdp_prep); free(rrd->rrd_value); -#endif } +#endif /* routine used by external libraries to free memory allocated by