X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_open.c;h=76c333f60ef99f2048dba724faceaa826d4e7b22;hp=c0e6545a2b2f3208b96147158ec9c65cf559a334;hb=990fcfb7eec407edfe504f42760bae204e1c074d;hpb=3c6f40dc07acfbcb48480e4b3153a5f42f6e96fe diff --git a/src/rrd_open.c b/src/rrd_open.c index c0e6545..76c333f 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,10 +1,45 @@ /***************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2rc9 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * 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. * @@ -34,20 +69,22 @@ /* positioned to the first cdp in the first rra */ int -rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) +rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) { char *mode = NULL; + int version; + rrd_init(rrd); if (rdwr == RRD_READONLY) { -#ifndef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) mode = "r"; #else mode = "rb"; #endif } else { -#ifndef WIN32 +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) mode = "r+"; #else mode = "rb+"; @@ -55,7 +92,7 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) } if (((*in_file) = fopen(file_name,mode)) == NULL ){ - rrd_set_error("opening '%s': %s",file_name, strerror(errno)); + rrd_set_error("opening '%s': %s",file_name, rrd_strerror(errno)); return (-1); } /* @@ -77,7 +114,8 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) MYFREAD(rrd->stat_head, stat_head_t, 1) - + version = atoi(rrd->stat_head->version); + /* lets do some test if we are on track ... */ if (strncmp(rrd->stat_head->cookie,RRD_COOKIE,4) != 0){ rrd_set_error("'%s' is not an RRD file",file_name); @@ -85,7 +123,7 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) fclose(*in_file); return(-1);} - if (atoi(rrd->stat_head->version) > atoi(RRD_VERSION)){ + if (version > atoi(RRD_VERSION)){ rrd_set_error("can't handle RRD file version %s", rrd->stat_head->version); free(rrd->stat_head); @@ -100,7 +138,20 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) MYFREAD(rrd->ds_def, ds_def_t, rrd->stat_head->ds_cnt) MYFREAD(rrd->rra_def, rra_def_t, rrd->stat_head->rra_cnt) - MYFREAD(rrd->live_head, live_head_t, 1) + /* handle different format for the live_head */ + if(version < 3) { + rrd->live_head = (live_head_t *)malloc(sizeof(live_head_t)); + if(rrd->live_head == NULL) { + rrd_set_error("live_head_t malloc"); + fclose(*in_file); + return (-1); + } + fread(&rrd->live_head->last_up, sizeof(long), 1, *in_file); + rrd->live_head->last_up_usec = 0; + } + else { + MYFREAD(rrd->live_head, live_head_t, 1) + } MYFREAD(rrd->pdp_prep, pdp_prep_t, rrd->stat_head->ds_cnt) MYFREAD(rrd->cdp_prep, cdp_prep_t, (rrd->stat_head->rra_cnt * rrd->stat_head->ds_cnt)) @@ -124,14 +175,14 @@ void rrd_init(rrd_t *rrd) void rrd_free(rrd_t *rrd) { - free(rrd->stat_head); - free(rrd->ds_def); - free(rrd->rra_def); - free(rrd->live_head); - free(rrd->rra_ptr); - free(rrd->pdp_prep); - free(rrd->cdp_prep); - free(rrd->rrd_value); + if (rrd->stat_head) free(rrd->stat_head); + if (rrd->ds_def) free(rrd->ds_def); + if (rrd->rra_def) free(rrd->rra_def); + if (rrd->live_head) free(rrd->live_head); + if (rrd->rra_ptr) free(rrd->rra_ptr); + if (rrd->pdp_prep) free(rrd->pdp_prep); + if (rrd->cdp_prep) free(rrd->cdp_prep); + if (rrd->rrd_value) free(rrd->rrd_value); } /* routine used by external libraries to free memory allocated by @@ -139,29 +190,38 @@ void rrd_free(rrd_t *rrd) void rrd_freemem(void *mem) { - free(mem); + if (mem) free(mem); } -int readfile(char *file_name, char **buffer, int skipfirst){ +int 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,strerror(errno)); + rrd_set_error("opening '%s': %s",file_name,rrd_strerror(errno)); return (-1); } } if (skipfirst){ - do { c = getc(input); } while (c != '\n' && ! feof(input)); + 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((MEMBLK+4)*sizeof(char))) == NULL) { + if (((*buffer) = (char *) malloc((totalcnt+4) * sizeof(char))) == NULL) { perror("Allocate Buffer:"); exit(1); }; do{ - writecnt += fread((*buffer)+writecnt, 1, MEMBLK * sizeof(char) ,input); + 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){