X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_open.c;h=c0e483591c8c9f8d76eff1070501a91822966f83;hp=80f9a04d09f1e63f270bfadc8adac015f321dae7;hb=7bd35b8d099910071a57c66687f6ef79c5df9a5c;hpb=2593a69e9485cf67c9654a2667f85971275004fe diff --git a/src/rrd_open.c b/src/rrd_open.c index 80f9a04..c0e4835 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.3rc7 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * 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 /* @@ -230,12 +226,14 @@ rrd_file_t *rrd_open( 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)); +#if defined USE_MADVISE + /* the live_head will be needed soonish, so hint accordingly */ + madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED); #endif + __rrd_read(rrd->legacy_last_up, time_t, + 1); + + rrd->live_head->last_up = *rrd->legacy_last_up; rrd->live_head->last_up_usec = 0; } else { #if defined USE_MADVISE @@ -246,15 +244,10 @@ rrd_file_t *rrd_open( __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); @@ -272,7 +265,8 @@ rrd_file_t *rrd_open( } -/* Close a reference to an rrd_file. */ +#if defined DEBUG && DEBUG > 1 +/* Print list of in-core pages of a the current rrd_file. */ static void mincore_print( rrd_file_t *rrd_file, @@ -314,6 +308,7 @@ void mincore_print( fprintf(stderr, "sorry mincore only works with mmap"); #endif } +#endif /* defined DEBUG && DEBUG > 1 */ /* drop cache except for the header and the active pages */ @@ -352,7 +347,8 @@ void rrd_dontneed( #endif } dontneed_start = active_block; - /* do not relase 'hot' block if update for this RAA will occure within 10 minutes */ + /* do not release 'hot' block if update for this RAA will occur + * 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) { @@ -381,6 +377,9 @@ int rrd_close( 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)); @@ -416,8 +415,8 @@ off_t rrd_seek( 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 + /* mimic fseek, which returns 0 upon success */ + return ret < 0; /*XXX: or just ret to mimic lseek */ } @@ -430,7 +429,7 @@ inline off_t rrd_tell( } -/* read count bytes into buffer buf, starting at rrd_file->pos. +/* Read count bytes into buffer buf, starting at rrd_file->pos. * Returns the number of bytes read or <0 on error. */ inline ssize_t rrd_read( @@ -440,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; } @@ -462,9 +466,9 @@ inline ssize_t rrd_read( } -/* write count bytes from buffer buf to the current position +/* 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, @@ -472,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 */ @@ -506,6 +514,7 @@ void rrd_init( rrd->ds_def = NULL; rrd->rra_def = NULL; rrd->live_head = NULL; + rrd->legacy_last_up = NULL; rrd->rra_ptr = NULL; rrd->pdp_prep = NULL; rrd->cdp_prep = NULL; @@ -516,9 +525,12 @@ void rrd_init( /* free RRD header data. */ #ifdef HAVE_MMAP -inline void rrd_free( - rrd_t UNUSED(*rrd)) +void rrd_free( + rrd_t *rrd) { + if (rrd->legacy_last_up) { /* this gets set for version < 3 only */ + free(rrd->live_head); + } } #else void rrd_free(