X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=86d608cc556a0838419882f55dafb36341d97523;hb=672a5d8877e055d90272210497302afb26e28c8f;hp=0c51577ba6114da91e89c6d7a2a700fd689830fb;hpb=b5982674ca6703df1ba19dfd18409081e946f0e9;p=rrdtool.git diff --git a/src/rrd_open.c b/src/rrd_open.c index 0c51577..86d608c 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_open.c Open an RRD File ***************************************************************************** @@ -21,16 +21,30 @@ /* 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) \ +#define __rrd_read(dst, dst_t, cnt) { \ + size_t wanted = sizeof(dst_t)*(cnt); \ + if (offset + wanted > rrd_file->file_len) { \ + rrd_set_error("reached EOF while loading header " #dst); \ + goto out_nullify_head; \ + } \ (dst) = (dst_t*)(void*) (data + offset); \ - offset += sizeof(dst_t) * (cnt) + offset += wanted; \ + } #else -#define __rrd_read(dst, dst_t, cnt) \ - if ((dst = malloc(sizeof(dst_t)*(cnt))) == NULL) { \ +#define __rrd_read(dst, dst_t, cnt) { \ + size_t wanted = sizeof(dst_t)*(cnt); \ + size_t got; \ + if ((dst = malloc(wanted)) == NULL) { \ rrd_set_error(#dst " malloc"); \ goto out_nullify_head; \ } \ - offset += read (rrd_file->fd, dst, sizeof(dst_t)*(cnt)) + got = read (rrd_file->fd, dst, wanted); \ + if (got != wanted) { \ + rrd_set_error("short read while reading header " #dst); \ + goto out_nullify_head; \ + } \ + offset += got; \ + } #endif /* get the address of the start of this page */ @@ -58,20 +72,21 @@ rrd_file_t *rrd_open( #ifdef HAVE_MMAP ssize_t _page_size = sysconf(_SC_PAGESIZE); int mm_prot = PROT_READ, mm_flags = 0; - char *data; + char *data = MAP_FAILED; #endif off_t offset = 0; struct stat statb; rrd_file_t *rrd_file = NULL; off_t newfile_size = 0; - if (rdwr & RRD_CREAT) { + if ((rdwr & RRD_CREAT) && (rdwr & RRD_CREAT_SETSIZE)) { /* 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); + if(!(rdwr & RRD_CREAT)) + 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); @@ -156,7 +171,13 @@ rrd_file_t *rrd_open( } } */ + #ifdef HAVE_MMAP + if(rrd_file->file_len == 0 && (rdwr & RRD_CREAT)) + { + rrd_file->file_start = NULL; + goto out_done; + } data = mmap(0, rrd_file->file_len, mm_prot, mm_flags, rrd_file->fd, offset); @@ -257,11 +278,34 @@ rrd_file_t *rrd_open( rrd_file->header_len = offset; rrd_file->pos = offset; + + { + unsigned long row_cnt = 0; + unsigned long i; + + for (i=0; istat_head->rra_cnt; i++) + row_cnt += rrd->rra_def[i].row_cnt; + + off_t correct_len = rrd_file->header_len + + sizeof(rrd_value_t) * row_cnt * rrd->stat_head->ds_cnt; + + if (correct_len > rrd_file->file_len) + { + rrd_set_error("'%s' is too small (should be %ld bytes)", + file_name, (long long) correct_len); + goto out_nullify_head; + } + } + out_done: return (rrd_file); out_nullify_head: rrd->stat_head = NULL; out_close: +#ifdef HAVE_MMAP + if (data != MAP_FAILED) + munmap(data, rrd_file->file_len); +#endif close(rrd_file->fd); out_free: free(rrd_file); @@ -321,12 +365,19 @@ void rrd_dontneed( rrd_t *rrd) { #if defined USE_MADVISE || defined HAVE_POSIX_FADVISE - unsigned long dontneed_start; - unsigned long rra_start; - unsigned long active_block; + off_t dontneed_start; + off_t rra_start; + off_t active_block; unsigned long i; ssize_t _page_size = sysconf(_SC_PAGESIZE); + if (rrd_file == NULL) { +#if defined DEBUG && DEBUG + fprintf (stderr, "rrd_dontneed: Argument 'rrd_file' is NULL.\n"); +#endif + return; + } + #if defined DEBUG && DEBUG > 1 mincore_print(rrd_file, "before"); #endif @@ -363,14 +414,19 @@ 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 @@ -486,10 +542,36 @@ ssize_t rrd_write( size_t count) { #ifdef HAVE_MMAP + /* These flags are used if creating a new RRD */ + int mm_prot = PROT_READ | PROT_WRITE, mm_flags = MAP_SHARED; + int old_size = rrd_file->file_len; + int new_size = rrd_file->file_len; if (count == 0) return 0; if (buf == NULL) return -1; /* EINVAL */ + + if((rrd_file->pos + count) > old_size) + { + new_size = rrd_file->pos + count; + rrd_file->file_len = new_size; + lseek(rrd_file->fd, new_size - 1, SEEK_SET); + write(rrd_file->fd, "\0", 1); /* poke */ + lseek(rrd_file->fd, 0, SEEK_SET); + if(rrd_file->file_start == NULL) + { + rrd_file->file_start = mmap(0, new_size, mm_prot, mm_flags, + rrd_file->fd, 0); + } + else + rrd_file->file_start = mremap(rrd_file->file_start, old_size, new_size, MREMAP_MAYMOVE); + + if (rrd_file->file_start == MAP_FAILED) { + rrd_set_error("m(re)maping file : %s", + rrd_strerror(errno)); + return -1; + } + } memcpy(rrd_file->file_start + rrd_file->pos, buf, count); rrd_file->pos += count; return count; /* mimmic write() semantics */