X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=8f08176494fe48f01b6f889f491a28209096603a;hb=f3df7df77761c610c9ba328fac01619f4e7b563f;hp=b85ceefae6e98e1f0bf3c0b4cce583c6923a2311;hpb=298b318acaf1147474ab9e97cac37c3608660efd;p=rrdtool.git diff --git a/src/rrd_open.c b/src/rrd_open.c index b85ceef..8f08176 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,10 +1,32 @@ /***************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * 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 @@ -47,76 +69,108 @@ /* 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 - mode = "r"; -#else - mode = "rb"; -#endif + mode = "rb"; } else { -#ifndef WIN32 - mode = "r+"; -#else - mode = "rb+"; -#endif + mode = "rb+"; } if (((*in_file) = fopen(file_name,mode)) == NULL ){ - rrd_set_error("opening '%s': %s",file_name, rrd_strerror(errno)); - return (-1); + rrd_set_error("opening '%s': %s",file_name, rrd_strerror(errno)); + return (-1); } + +#ifdef POSIX_FADVISE + /* In general we need no read-ahead when dealing with rrd_files. + 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(fileno(*in_file), 0, 0, POSIX_FADV_RANDOM)) { + rrd_set_error("setting POSIX_FADV_RANDOM on '%s': %s",file_name, rrd_strerror(errno)); + fclose(*in_file); + return(-1); + } +#endif + /* - if (rdwr == RRD_READWRITE) - { - if (setvbuf((*in_file),NULL,_IONBF,2)) { - rrd_set_error("failed to disable the stream buffer\n"); - return (-1); - } - } + if (rdwr == RRD_READWRITE) + { + if (setvbuf((*in_file),NULL,_IONBF,2)) { + rrd_set_error("failed to disable the stream buffer\n"); + return (-1); + } + } */ #define MYFREAD(MYVAR,MYVART,MYCNT) \ if ((MYVAR = malloc(sizeof(MYVART) * MYCNT)) == NULL) {\ - rrd_set_error("" #MYVAR " malloc"); \ + rrd_set_error("" #MYVAR " malloc"); \ fclose(*in_file); \ - return (-1); } \ + return (-1); } \ fread(MYVAR,sizeof(MYVART),MYCNT, *in_file); MYFREAD(rrd->stat_head, stat_head_t, 1) - - /* 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); - free(rrd->stat_head); - fclose(*in_file); - return(-1);} - - if (atoi(rrd->stat_head->version) > atoi(RRD_VERSION)){ - rrd_set_error("can't handle RRD file version %s", - rrd->stat_head->version); - free(rrd->stat_head); - fclose(*in_file); - return(-1);} - - if (rrd->stat_head->float_cookie != FLOAT_COOKIE){ - rrd_set_error("This RRD was created on other architecture"); - free(rrd->stat_head); - fclose(*in_file); - return(-1);} + /* lets see if the first read worked */ + if (ferror( *in_file ) || feof(*in_file)) { + rrd_set_error("reading the cookie off %s faild",file_name); + fclose(*in_file); + return(-1); + } + + /* 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); + free(rrd->stat_head); + rrd->stat_head = NULL; + fclose(*in_file); + return(-1);} + + if (rrd->stat_head->float_cookie != FLOAT_COOKIE){ + rrd_set_error("This RRD was created on other architecture"); + free(rrd->stat_head); + rrd->stat_head = NULL; + fclose(*in_file); + return(-1);} + + version = atoi(rrd->stat_head->version); + + if (version > atoi(RRD_VERSION)){ + rrd_set_error("can't handle RRD file version %s", + rrd->stat_head->version); + free(rrd->stat_head); + rrd->stat_head = NULL; + fclose(*in_file); + return(-1);} + 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)) + * rrd->stat_head->ds_cnt)) MYFREAD(rrd->rra_ptr, rra_ptr_t, rrd->stat_head->rra_cnt) #undef MYFREAD @@ -155,32 +209,41 @@ void rrd_freemem(void *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,rrd_strerror(errno)); - return (-1); + 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) { - perror("Allocate Buffer:"); - exit(1); + 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){ - perror("Realloc Buffer:"); - exit(1); - }; + totalcnt += MEMBLK; + if (((*buffer)=rrd_realloc((*buffer), (totalcnt+4) * sizeof(char)))==NULL){ + perror("Realloc Buffer:"); + exit(1); + }; } } while (! feof(input)); (*buffer)[writecnt] = '\0';