X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_open.c;h=af91c7bb5099b72c9cb380c9d28cc6eb619c4309;hp=0dab23d5a60de454e0e09d75ba83410c5a9212d6;hb=e1597899f28b7fed13a029c84d9b36bbe5f16505;hpb=3d068765c6b6c8d096e0692f22e5b5e407948b54 diff --git a/src/rrd_open.c b/src/rrd_open.c index 0dab23d..af91c7b 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3rc2 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_open.c Open an RRD File ***************************************************************************** @@ -34,10 +34,11 @@ #endif /* get the address of the start of this page */ +#if defined USE_MADVISE || defined HAVE_POSIX_FADVISE #ifndef PAGE_START #define PAGE_START(addr) ((addr)&(~(_page_size-1))) #endif - +#endif /* Open a database file, return its header and an open filehandle, * positioned to the first cdp in the first rra. @@ -115,6 +116,9 @@ rrd_file_t *rrd_open( mm_flags |= MAP_NONBLOCK; /* just populate ptes */ #endif } +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) + flags |= O_BINARY; +#endif if ((rrd_file->fd = open(file_name, flags, mode)) < 0) { rrd_set_error("opening '%s': %s", file_name, rrd_strerror(errno)); @@ -226,12 +230,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 @@ -314,6 +320,7 @@ void rrd_dontneed( rrd_file_t *rrd_file, rrd_t *rrd) { +#if defined USE_MADVISE || defined HAVE_POSIX_FADVISE unsigned long dontneed_start; unsigned long rra_start; unsigned long active_block; @@ -356,19 +363,29 @@ void rrd_dontneed( rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt * sizeof(rrd_value_t); } + + if (dontneed_start < rrd_file->file_len) { #ifdef USE_MADVISE - madvise(rrd_file->file_start + dontneed_start, - rrd_file->file_len - dontneed_start, MADV_DONTNEED); + 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); + 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 +#endif /* without madvise and posix_fadvise ist does not make much sense todo anything */ } + + + + int rrd_close( rrd_file_t *rrd_file) { @@ -420,7 +437,7 @@ off_t rrd_seek( /* Get current position in rrd_file. */ -inline off_t rrd_tell( +off_t rrd_tell( rrd_file_t *rrd_file) { return rrd_file->pos; @@ -430,7 +447,7 @@ inline off_t rrd_tell( /* 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( +ssize_t rrd_read( rrd_file_t *rrd_file, void *buf, size_t count) @@ -468,7 +485,7 @@ inline ssize_t rrd_read( * rrd_file->pos of rrd_file->fd. * Returns the number of bytes written or <0 on error. */ -inline ssize_t rrd_write( +ssize_t rrd_write( rrd_file_t *rrd_file, const void *buf, size_t count) @@ -493,7 +510,7 @@ inline ssize_t rrd_write( /* flush all data pending to be written to FD. */ -inline void rrd_flush( +void rrd_flush( rrd_file_t *rrd_file) { if (fdatasync(rrd_file->fd) != 0) { @@ -512,6 +529,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; @@ -522,9 +540,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( @@ -550,64 +571,3 @@ void rrd_freemem( { free(mem); } - - -/* 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)); - (*buffer)[writecnt] = '\0'; - if (strcmp("-", file_name) != 0) { - fclose(input); - }; - return writecnt; -}