/*****************************************************************************
- * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2004
+ * RRDtool 1.2.13 Copyright by Tobi Oetiker, 1997-2006
*****************************************************************************
* rrd_restore.c creates new rrd from data dumped by rrd_dump.c
*****************************************************************************/
#include "rrd_rpncalc.h"
#include <fcntl.h>
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include <io.h>
+#define open _open
+#define close _close
+#endif
+
/* Prototypes */
void xml_lc(char*);
void parse_patch1028_CDP_params(char **buf, rrd_t *rrd, int rra_index, int ds_index);
void parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index);
-/* convert all ocurances of <BlaBlaBla> to <blablabla> */
+/* convert all occurrences of <BlaBlaBla> to <blablabla> */
void xml_lc(char* buf){
int intag=0;
char *ptr,*ptr2,*ptr3; /* walks thought the buffer */
long rows=0,mempool=0,i=0;
int rra_index;
+ int input_version;
xml_lc(buf); /* lets lowercase all active parts of the xml */
ptr=buf;
ptr2=buf;
strcpy(rrd->stat_head->cookie,RRD_COOKIE);
read_tag(&ptr,"version","%4[0-9]",rrd->stat_head->version);
+ input_version = atoi(rrd->stat_head->version);
/* added primitive version checking */
- if (atoi(rrd -> stat_head -> version) > atoi(RRD_VERSION) )
+ if (input_version > atoi(RRD_VERSION) || input_version < 1)
{
- rrd_set_error("Incompatible file version, detected version %s is bigger than supported version %s\n",
+ rrd_set_error("Incompatible file version, detected version %s. This is not supported by the version %s restore tool.\n",
rrd -> stat_head -> version, RRD_VERSION );
- free(rrd -> stat_head);
+ free(rrd -> stat_head);
+ rrd->stat_head = NULL;
return -1;
}
- if (atoi(rrd -> stat_head -> version) < 2)
+ /* make sure we output the right version */
+ strcpy(rrd->stat_head->version,RRD_VERSION);
+
+ /* if (atoi(rrd -> stat_head -> version) < 2)
{
- rrd_set_error("Can only restore version >= 2 (Not %s). Dump your rrd using a current rrdtool dump.", rrd -> stat_head -> version );
- free(rrd -> stat_head);
+ rrd_set_error("Can only restore version >= 2 (Not %s). Dump your old rrd using a current rrdtool dump.", rrd -> stat_head -> version );
return -1;
- }
+ } */
+
rrd->stat_head->float_cookie = FLOAT_COOKIE;
rrd->stat_head->ds_cnt = 0;
rrd->stat_head->rra_cnt = 0;
read_tag(&ptr2,"type",DST_FMT,rrd->ds_def[rrd->stat_head->ds_cnt-1].dst);
/* test for valid type */
- if(dst_conv(rrd->ds_def[rrd->stat_head->ds_cnt-1].dst) == -1) return -1;
+ if( (int)dst_conv(rrd->ds_def[rrd->stat_head->ds_cnt-1].dst) == -1) return -1;
if (dst_conv(rrd->ds_def[rrd->stat_head->ds_cnt-1].dst) != DST_CDEF)
{
read_tag(&ptr2,"max","%lf",&(rrd->ds_def[rrd->stat_head->ds_cnt-1].par[DS_max_val].u_val));
} else { /* DST_CDEF */
char buffer[1024];
- read_tag(&ptr2,"cdef","%s",buffer);
+ read_tag(&ptr2,"cdef","%1000s",buffer);
parseCDEF_DS(buffer,rrd,rrd -> stat_head -> ds_cnt - 1);
+ if (rrd_test_error()) return -1;
}
read_tag(&ptr2,"last_ds","%30s",rrd->pdp_prep[rrd->stat_head->ds_cnt-1].last_ds);
while (eat_tag(&ptr2,"rra") == 1){
rrd->stat_head->rra_cnt++;
- /* alocate and reset rra definition areas */
+ /* allocate and reset rra definition areas */
if((rrd->rra_def = rrd_realloc(rrd->rra_def,rrd->stat_head->rra_cnt*sizeof(rra_def_t)))==NULL){
rrd_set_error("allocating rra_def"); return -1; }
memset(&(rrd->rra_def[rrd->stat_head->rra_cnt-1]), 0, sizeof(rra_def_t));
- /* alocate and reset consolidation point areas */
+ /* allocate and reset consolidation point areas */
if((rrd->cdp_prep = rrd_realloc(rrd->cdp_prep,
rrd->stat_head->rra_cnt
*rrd->stat_head->ds_cnt*sizeof(cdp_prep_t)))==NULL){
read_tag(&ptr2,"cf",CF_NAM_FMT,rrd->rra_def[rrd->stat_head->rra_cnt-1].cf_nam);
/* test for valid type */
- if(cf_conv(rrd->rra_def[rrd->stat_head->rra_cnt-1].cf_nam) == -1) return -1;
+ if( (int)cf_conv(rrd->rra_def[rrd->stat_head->rra_cnt-1].cf_nam) == -1) return -1;
read_tag(&ptr2,"pdp_per_row","%lu",&(rrd->rra_def[rrd->stat_head->rra_cnt-1].pdp_cnt));
/* support to read RRA parameters */
- eat_tag(&ptr2, "params");
- skip(&ptr2);
rra_index = rrd->stat_head->rra_cnt - 1;
- /* backwards compatibility w/ old patch */
+ if ( input_version < 2 ){
+ read_tag(&ptr2, "xff","%lf",
+ &(rrd->rra_def[rra_index].par[RRA_cdp_xff_val].u_val));
+ } else {
+ eat_tag(&ptr2, "params");
+ skip(&ptr2);
+ /* backwards compatibility w/ old patch */
if (strncmp(ptr2, "<value>",7) == 0) {
- parse_patch1028_RRA_params(&ptr2,rrd,rra_index);
+ parse_patch1028_RRA_params(&ptr2,rrd,rra_index);
} else {
switch(cf_conv(rrd -> rra_def[rra_index].cf_nam)) {
case CF_HWPREDICT:
}
}
eat_tag(&ptr2, "/params");
+ }
+
+
eat_tag(&ptr2,"cdp_prep");
- for(i=0;i<rrd->stat_head->ds_cnt;i++)
+ for(i=0;i< (int)rrd->stat_head->ds_cnt;i++)
{
eat_tag(&ptr2,"ds");
/* support to read CDP parameters */
rra_index = rrd->stat_head->rra_cnt-1;
skip(&ptr2);
+ if ( input_version < 2 ){
+ rrd->cdp_prep[rrd->stat_head->ds_cnt*(rra_index)+i].scratch[CDP_primary_val].u_val = 0.0;
+ rrd->cdp_prep[rrd->stat_head->ds_cnt*(rra_index)+i].scratch[CDP_secondary_val].u_val = 0.0;
+ read_tag(&ptr2,"value","%lf",&(rrd->cdp_prep[rrd->stat_head->ds_cnt
+ *(rra_index) +i].scratch[CDP_val].u_val));
+ read_tag(&ptr2,"unknown_datapoints","%lu",&(rrd->cdp_prep[rrd->stat_head->ds_cnt
+ *(rra_index) +i].scratch[CDP_unkn_pdp_cnt].u_cnt));
+ } else {
+
if (strncmp(ptr2, "<value>",7) == 0) {
parse_patch1028_CDP_params(&ptr2,rrd,rra_index,i);
} else {
break;
}
}
+ }
eat_tag(&ptr2,"/ds");
}
eat_tag(&ptr2,"/cdp_prep");
rows++;
mempool--;
rrd->rra_def[rrd->stat_head->rra_cnt-1].row_cnt++;
- for(i=0;i<rrd->stat_head->ds_cnt;i++){
+ for(i=0;i< (int)rrd->stat_head->ds_cnt;i++){
rrd_value_t * value = &(rrd->rrd_value[(rows-1)*rrd->stat_head->ds_cnt+i]);
return(-1);
}
- for(i=0; i <rrd->stat_head->rra_cnt; i++) {
+ for(i=0; i < (int)rrd->stat_head->rra_cnt; i++) {
/* last row in the xml file is the most recent; as
* rrd_update increments the current row pointer, set cur_row
* here to the last row. */
if (strcmp("-",file_name)==0){
rrd_file= stdout;
} else {
-#ifdef WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
fdflags = O_RDWR|O_BINARY|O_CREAT;
#else
fdflags = O_WRONLY|O_CREAT;
fwrite(rrd->rra_def,
sizeof(rra_def_t), rrd->stat_head->rra_cnt, rrd_file);
- /* maybe the xml hold an old formatted rrd */
- if (atoi(rrd->stat_head->version) < 3)
- fwrite(&(rrd->live_head->last_up), sizeof(long),1, rrd_file);
- else
- fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file);
+ fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file);
fwrite( rrd->pdp_prep, sizeof(pdp_prep_t),rrd->stat_head->ds_cnt,rrd_file);
char force_overwrite = 0;
/* init rrd clean */
- rrd_init(&rrd);
- if (argc<3) {
- rrd_set_error("usage rrdtool %s [--range-check/-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]);
- return -1;
- }
-
+ optind = 0; opterr = 0; /* initialize getopt */
while (1) {
static struct option long_options[] =
{
- {"range-check", required_argument, 0, 'r'},
- {"force-overwrite", required_argument, 0, 'f'},
+ {"range-check", no_argument, 0, 'r'},
+ {"force-overwrite", no_argument, 0, 'f'},
{0,0,0,0}
};
int option_index = 0;
int opt;
- opt = getopt_long(argc, argv, "r:f", long_options, &option_index);
+ opt = getopt_long(argc, argv, "rf", long_options, &option_index);
if (opt == EOF)
break;
break;
}
}
+
+ if (argc-optind != 2) {
+ rrd_set_error("usage rrdtool %s [--range-check/-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]);
+ return -1;
+ }
if (readfile(argv[optind],&buf,0)==-1){
return -1;
}
+
+ rrd_init(&rrd);
+
if (xml2rrd(buf,&rrd,rc)==-1) {
rrd_free(&rrd);
free(buf);
return -1;
}
+
free(buf);
+
if(rrd_write(argv[optind+1],&rrd,force_overwrite)==-1){
rrd_free(&rrd);
return -1;
projects / rrdtool.git / blobdiff