diff --git a/program/src/rrd_open.c b/program/src/rrd_open.c
index 9ce17a33f300c9b06d80660fe66d250d90e44e26..443a1a5652a50c01a023a47c6fb51773241d364d 100644 (file)
--- a/program/src/rrd_open.c
+++ b/program/src/rrd_open.c
*****************************************************************************
* $Id$
* $Log$
*****************************************************************************
* $Id$
* $Log$
+ * 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
* 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
int readfile(char *file_name, char **buffer, int skipfirst){
long writecnt=0,totalcnt = MEMBLK;
int readfile(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; }
FILE *input=NULL;
char c ;
if ((strcmp("-",file_name) == 0)) { input = stdin; }
}
}
if (skipfirst){
}
}
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{
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){
if (writecnt >= totalcnt){
totalcnt += MEMBLK;
if (((*buffer)=rrd_realloc((*buffer), (totalcnt+4) * sizeof(char)))==NULL){