/*****************************************************************************
- * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2.1 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
+ * 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 <ruben@ainek.com>
+ *
* 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
/* 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 ){
fclose(*in_file);
return (-1);
}
- fread(&rrd->live_head->last_up, sizeof(long), 1, *in_file);
+ 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)
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){