X-Git-Url: https://git.tokkee.org/?p=pkg-rrdtool.git;a=blobdiff_plain;f=src%2Frrd_resize.c;h=2dc47b0ce058cbde9de263f101a7bb87e46b226e;hp=771209f438f37d679b65a97e3e7db234bcb31a63;hb=ffa00ac697dccce18dca8880ca7a14066521ac5c;hpb=51c3d3fb997c22e1ee828470413f1e84989e1f6c diff --git a/src/rrd_resize.c b/src/rrd_resize.c index 771209f..2dc47b0 100644 --- a/src/rrd_resize.c +++ b/src/rrd_resize.c @@ -1,16 +1,14 @@ /***************************************************************************** - * RRDtool 1.3.8 Copyright by Tobi Oetiker, 1997-2009 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_resize.c Alters size of an RRA ***************************************************************************** * Initial version by Alex van den Bogaerdt *****************************************************************************/ -#include "rrd_tool.h" - -#ifdef WIN32 #include -#endif + +#include "rrd_tool.h" int rrd_resize( int argc, @@ -59,6 +57,7 @@ int rrd_resize( modify = -modify; + rrd_init(&rrdold); rrd_file = rrd_open(infilename, &rrdold, RRD_READWRITE | RRD_COPY); if (rrd_file == NULL) { rrd_free(&rrdold); @@ -87,16 +86,31 @@ int rrd_resize( rrd_close(rrd_file); return (-1); } - /* the size of the new file */ - /* yes we are abusing the float cookie for this, aargh */ + + 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); } - rrdnew.stat_head->float_cookie = rrd_file->file_len + - (rrdold.stat_head->ds_cnt * sizeof(rrd_value_t) * modify); + 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); + return (-1); + } + 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 */ + rrdnew.rra_def[target_rra].row_cnt += modify; + rrd_out_file = rrd_open(outfilename, &rrdnew, RRD_READWRITE | RRD_CREAT); if (rrd_out_file == NULL) { rrd_set_error("Can't create '%s': %s", outfilename, @@ -116,16 +130,7 @@ int rrd_resize( return (-1); } /*XXX: do one write for those parts of header that are unchanged */ - if ((rrdnew.stat_head = (stat_head_t*)malloc(sizeof(stat_head_t))) == NULL) { - rrd_set_error("allocating stat_head for new RRD"); - rrd_free(&rrdnew); - rrd_free(&rrdold); - rrd_close(rrd_file); - rrd_close(rrd_out_file); - return (-1); - } - - if ((rrdnew.rra_ptr = (rra_ptr_t*)malloc(sizeof(rra_ptr_t) * rrdold.stat_head->rra_cnt)) == NULL) { + if ((rrdnew.rra_ptr = (rra_ptr_t *)malloc(sizeof(rra_ptr_t) * rrdold.stat_head->rra_cnt)) == NULL) { rrd_set_error("allocating rra_ptr for new RRD"); rrd_free(&rrdnew); rrd_free(&rrdold); @@ -134,71 +139,16 @@ int rrd_resize( return (-1); } - 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); - } - -#ifndef WIN32 - memcpy(rrdnew.stat_head,rrdold.stat_head,sizeof(stat_head_t)); + /* Put this back the way it was so that the rest of the algorithm + below remains unchanged, it will be corrected later */ + rrdnew.rra_def[target_rra].row_cnt -= modify; + rrdnew.ds_def = rrdold.ds_def; - memcpy(rrdnew.rra_def,rrdold.rra_def,sizeof(rra_def_t) * rrdold.stat_head->rra_cnt); rrdnew.live_head = rrdold.live_head; rrdnew.pdp_prep = rrdold.pdp_prep; rrdnew.cdp_prep = rrdold.cdp_prep; memcpy(rrdnew.rra_ptr,rrdold.rra_ptr,sizeof(rra_ptr_t) * rrdold.stat_head->rra_cnt); -#else // WIN32 - /* - * For windows Other fields also should be allocated. Crashes otherwise - */ - - if ((rrdnew.ds_def = (ds_def_t*)malloc(sizeof(ds_def_t) * rrdold.stat_head->ds_cnt)) == NULL) { - rrd_set_error("allocating ds_def for new RRD"); - rrd_free(&rrdnew); - rrd_free(&rrdold); - rrd_close(rrd_file); - rrd_close(rrd_out_file); - return (-1); - } - - if ((rrdnew.live_head = (live_head_t*)malloc(sizeof(live_head_t))) == NULL) { - rrd_set_error("allocating live_head for new RRD"); - rrd_free(&rrdnew); - rrd_free(&rrdold); - rrd_close(rrd_file); - rrd_close(rrd_out_file); - return (-1); - } - if ((rrdnew.pdp_prep = (pdp_prep_t*)malloc(sizeof(pdp_prep_t))) == NULL) { - rrd_set_error("allocating pdp_prep for new RRD"); - rrd_free(&rrdnew); - rrd_free(&rrdold); - rrd_close(rrd_file); - rrd_close(rrd_out_file); - return (-1); - } - - if ((rrdnew.cdp_prep = (cdp_prep_t*)malloc(sizeof(cdp_prep_t))) == NULL) { - rrd_set_error("allocating cdp_prep 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.ds_def,rrdold.ds_def,sizeof(ds_def_t) * rrdold.stat_head->ds_cnt); - memcpy(rrdnew.rra_def,rrdold.rra_def,sizeof(rra_def_t) * rrdold.stat_head->rra_cnt); - memcpy(rrdnew.live_head,rrdold.live_head,sizeof(live_head_t)); - memcpy(rrdnew.pdp_prep,rrdold.pdp_prep,sizeof(pdp_prep_t)); - memcpy(rrdnew.cdp_prep,rrdold.cdp_prep,sizeof(cdp_prep_t)); - memcpy(rrdnew.rra_ptr,rrdold.rra_ptr,sizeof(rra_ptr_t) * rrdold.stat_head->rra_cnt); -#endif // WIN32 version = atoi(rrdold.stat_head->version); switch (version) {