/*****************************************************************************
- * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2.11 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 <slif@bellsouth.net>
+ *
+ * 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 <speck@ruc.dk>
+ *
* 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
/* 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)
{
rrd_init(rrd);
if (rdwr == RRD_READONLY) {
-#ifndef WIN32
- mode = "r";
-#else
mode = "rb";
-#endif
} else {
-#ifndef WIN32
- mode = "r+";
-#else
mode = "rb+";
-#endif
}
if (((*in_file) = fopen(file_name,mode)) == NULL ){
if ((MYVAR = malloc(sizeof(MYVART) * MYCNT)) == NULL) {\
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)
- version = atoi(rrd->stat_head->version);
+ /* 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){
fclose(*in_file);
return(-1);}
- if (version > atoi(RRD_VERSION)){
- rrd_set_error("can't handle RRD file version %s",
- rrd->stat_head->version);
+ 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);}
- if (rrd->stat_head->float_cookie != FLOAT_COOKIE){
- rrd_set_error("This RRD was created on other architecture");
+ 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);
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)
/* handle different format for the live_head */
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; }
}
}
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){