X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=6a3cf34a8286fc6cc39b5f124f04a543a95b4399;hb=f1a53d6f5926d43a74c190ce6e13edcadfd61635;hp=4306eff957708e47badafa12fc2b0d6f703ec5d1;hpb=aeeff12d6f81965685019e9d416f0ec71a1ce0ab;p=rrdtool.git diff --git a/src/rrd_open.c b/src/rrd_open.c index 4306eff..6a3cf34 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_open.c Open an RRD File ***************************************************************************** @@ -140,11 +140,7 @@ rrd_file_t *rrd_open( 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; - } + posix_fadvise(rrd_file->fd, 0, 0, POSIX_FADV_RANDOM); #endif /* @@ -210,8 +206,7 @@ rrd_file_t *rrd_open( #if defined USE_MADVISE /* the ds_def will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), - sizeof(ds_def_t) * rrd->stat_head->ds_cnt, - MADV_WILLNEED); + 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); @@ -219,8 +214,7 @@ rrd_file_t *rrd_open( #if defined USE_MADVISE /* the rra_def will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), - sizeof(rra_def_t) * rrd->stat_head->rra_cnt, - MADV_WILLNEED); + 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); @@ -243,7 +237,7 @@ rrd_file_t *rrd_open( #if defined USE_MADVISE /* the live_head will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), - sizeof(live_head_t), MADV_WILLNEED); + sizeof(live_head_t), MADV_WILLNEED); #endif __rrd_read(rrd->live_head, live_head_t, 1); @@ -276,7 +270,10 @@ rrd_file_t *rrd_open( /* Close a reference to an rrd_file. */ static -void mincore_print(rrd_file_t *rrd_file,char * mark){ +void mincore_print( + rrd_file_t *rrd_file, + char *mark) +{ #ifdef HAVE_MMAP /* pretty print blocks in core */ off_t off; @@ -297,7 +294,7 @@ void mincore_print(rrd_file_t *rrd_file,char * mark){ if (off == 0) was_in = is_in; if (was_in != is_in) { - fprintf(stderr, "%s: %sin core: %p len %ld\n",mark, + fprintf(stderr, "%s: %sin core: %p len %ld\n", mark, was_in ? "" : "not ", vec + prev, off - prev); was_in = is_in; prev = off; @@ -310,64 +307,67 @@ void mincore_print(rrd_file_t *rrd_file,char * mark){ fprintf(stderr, "mincore: %s", rrd_strerror(errno)); } #else - fprintf(stderr, "sorry mincore only works with mmap"); + fprintf(stderr, "sorry mincore only works with mmap"); #endif } /* drop cache except for the header and the active pages */ -void -rrd_dontneed ( +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; + 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"); + mincore_print(rrd_file, "before"); #endif /* ignoring errors from RRDs that are smaller then the file_len+rounding */ 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) { + 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); + 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); + posix_fadvise(rrd_file->fd, dontneed_start, + active_block - dontneed_start - 1, + POSIX_FADV_DONTNEED); #endif - } - dontneed_start = active_block; - /* do not relase 'hot' block if update for this RAA will occure within 10 minutes */ - if ( rrd->stat_head->pdp_step * rrd->rra_def[i].pdp_cnt - - rrd->live_head->last_up % (rrd->stat_head->pdp_step * rrd->rra_def[i].pdp_cnt) < 10*60 ){ + } + dontneed_start = active_block; + /* do not relase 'hot' block if update for this RAA will occure within 10 minutes */ + if (rrd->stat_head->pdp_step * rrd->rra_def[i].pdp_cnt - + rrd->live_head->last_up % (rrd->stat_head->pdp_step * + rrd->rra_def[i].pdp_cnt) < 10 * 60) { dontneed_start += _page_size; - } - rra_start += rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt * sizeof(rrd_value_t); + } + 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); + 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); + 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"); + mincore_print(rrd_file, "after"); #endif } @@ -375,7 +375,11 @@ int rrd_close( rrd_file_t *rrd_file) { int ret; + #ifdef HAVE_MMAP + ret = msync(rrd_file->file_start, rrd_file->file_len,MS_ASYNC); + if (ret != 0) + rrd_set_error("msync rrd_file: %s", rrd_strerror(errno)); ret = munmap(rrd_file->file_start, rrd_file->file_len); if (ret != 0) rrd_set_error("munmap rrd_file: %s", rrd_strerror(errno)); @@ -435,8 +439,13 @@ inline ssize_t rrd_read( { #ifdef HAVE_MMAP size_t _cnt = count; - ssize_t _surplus = rrd_file->pos + _cnt - rrd_file->file_len; + ssize_t _surplus; + if (rrd_file->pos > rrd_file->file_len || _cnt == 0) /* EOF */ + return 0; + if (buf == NULL) + return -1; /* EINVAL */ + _surplus = rrd_file->pos + _cnt - rrd_file->file_len; if (_surplus > 0) { /* short read */ _cnt -= _surplus; } @@ -459,7 +468,7 @@ inline ssize_t rrd_read( /* write count bytes from buffer buf to the current position * rrd_file->pos of rrd_file->fd. - * Returns the number of bytes written. */ + * Returns the number of bytes written or <0 on error. */ inline ssize_t rrd_write( rrd_file_t *rrd_file, @@ -467,6 +476,10 @@ inline ssize_t rrd_write( size_t count) { #ifdef HAVE_MMAP + if (count == 0) + return 0; + if (buf == NULL) + return -1; /* EINVAL */ memcpy(rrd_file->file_start + rrd_file->pos, buf, count); rrd_file->pos += count; return count; /* mimmic write() semantics */