diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index d84096cdc278962a7ac2b0528453ecfc5fd705d7..3613d3f2b8db8fb4e889563ea488b878a5e224b5 100644 (file)
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_resize.c Alters size of an RRA
*****************************************************************************
rrd_init(&rrdnew);
/* These need to be initialised before calling rrd_open() with
the RRD_CREATE flag */
+
if ((rrdnew.stat_head = (stat_head_t*)calloc(1, sizeof(stat_head_t))) == NULL) {
rrd_set_error("allocating stat_head for new RRD");
rrd_free(&rrdold);
rrd_close(rrd_file);
return (-1);
}
+ memcpy(rrdnew.stat_head,rrdold.stat_head,sizeof(stat_head_t));
if ((rrdnew.rra_def = (rra_def_t *)malloc(sizeof(rra_def_t) * rrdold.stat_head->rra_cnt)) == NULL) {
rrd_set_error("allocating rra_def for new RRD");
rrd_free(&rrdnew);
rrd_free(&rrdold);
rrd_close(rrd_file);
- rrd_close(rrd_out_file);
return (-1);
}
-
- memcpy(rrdnew.stat_head,rrdold.stat_head,sizeof(stat_head_t));
memcpy(rrdnew.rra_def,rrdold.rra_def,sizeof(rra_def_t) * rrdold.stat_head->rra_cnt);
/* Set this so that the file will be created with the correct size */
rrd_set_error("Can't create '%s': %s", outfilename,
rrd_strerror(errno));
rrd_free(&rrdnew);
+ rrd_free(&rrdold);
+ rrd_close(rrd_file);
return (-1);
}
if (rrd_lock(rrd_out_file) != 0) {
rrd_set_error("could not lock new RRD");
+ rrd_free(&rrdnew);
rrd_free(&rrdold);
rrd_close(rrd_file);
rrd_close(rrd_out_file);
case 3:
break;
case 1:
- rrdold.stat_head->version[3] = '3';
+ rrdnew.stat_head->version[3] = '3';
break;
default:
rrd_set_error("Do not know how to handle RRD version %s",
rrdold.stat_head->version);
+
+ rrdnew.ds_def = NULL;
+ rrdnew.live_head = NULL;
+ rrdnew.pdp_prep = NULL;
+ rrdnew.cdp_prep = NULL;
+
rrd_free(&rrdnew);
rrd_free(&rrdold);
rrd_close(rrd_file);
rrd_write(rrd_out_file, &buffer, sizeof(rrd_value_t) * 1);
l--;
}
-#ifndef HAVE_MMAP
buffer = DNAN;
l = rrdnew.stat_head->ds_cnt * modify;
while (l > 0) {
rrd_write(rrd_out_file, &buffer, sizeof(rrd_value_t) * 1);
l--;
}
-#else
- /* for the mmap case, we did already fill the whole new file with DNAN
- * before we copied the old values, so nothing to do here. */
-#endif
} else {
/* Removing rows. Normally this would be just after the cursor
** however this may also mean that we wrap to the beginning of
/* Move the rest of the CDPs
*/
while (1) {
- if (rrd_read(rrd_file, &buffer, sizeof(rrd_value_t) * 1) <= 0)
+ ssize_t b_read;
+ if ((b_read=rrd_read(rrd_file, &buffer, sizeof(rrd_value_t) * 1)) <= 0)
break;
- rrd_write(rrd_out_file, &buffer, sizeof(rrd_value_t) * 1);
+ if(rrd_out_file->pos+b_read > rrd_out_file->file_len) {
+ fprintf(stderr,"WARNING: ignoring last %zu bytes\nWARNING: if you see this message multiple times for a single file you're in trouble\n", b_read);
+ continue;
+ }
+ rrd_write(rrd_out_file, &buffer, b_read);
}
rrdnew.rra_def[target_rra].row_cnt += modify;
rrd_seek(rrd_out_file,
rrd_close(rrd_file);
rrd_close(rrd_out_file);
rrd_free(&rrdold);
+
+ rrdnew.ds_def = NULL;
+ rrdnew.live_head = NULL;
+ rrdnew.pdp_prep = NULL;
+ rrdnew.cdp_prep = NULL;
+
rrd_free(&rrdnew);
return (0);
}