forward ported patch for rra cur_row randomization in rrd_restore from 1.2.28 to...

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1453 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 23f53bf..d92210f 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -693,8 +693,8 @@ static int parse_tag_rra(
             break;
     }
 
             break;
     }
 

-    /* Set the RRA pointer to the last value in the archive */
-    cur_rra_ptr->cur_row = cur_rra_def->row_cnt - 1;
+    /* Set the RRA pointer to a random location */
+    cur_rra_ptr->cur_row = random() % cur_rra_def->row_cnt;

 
     return (status);
 }                       /* int parse_tag_rra */
 
     return (status);
 }                       /* int parse_tag_rra */


@@ -966,7 +966,7 @@ static int write_file(
 {
     FILE     *fh;
     unsigned int i;
 {
     FILE     *fh;
     unsigned int i;

-    unsigned int value_count;
+    unsigned int rra_offset;

 
     if (strcmp("-", file_name) == 0)
         fh = stdout;
 
     if (strcmp("-", file_name) == 0)
         fh = stdout;


@@ -1009,11 +1009,21 @@ static int write_file(
     fwrite(rrd->rra_ptr, sizeof(rra_ptr_t), rrd->stat_head->rra_cnt, fh);
 
     /* calculate the number of rrd_values to dump */
     fwrite(rrd->rra_ptr, sizeof(rra_ptr_t), rrd->stat_head->rra_cnt, fh);
 
     /* calculate the number of rrd_values to dump */

-    value_count = 0;
-    for (i = 0; i < rrd->stat_head->rra_cnt; i++)
-        value_count += (rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt);
+    rra_offset=0;
+    for(i=0; i <  rrd->stat_head->rra_cnt; i++)
+    {
+        unsigned long num_rows = rrd->rra_def[i].row_cnt;
+        unsigned long cur_row = rrd->rra_ptr[i].cur_row;
+        unsigned long ds_cnt = rrd->stat_head->ds_cnt;

 
 

-    fwrite(rrd->rrd_value, sizeof(rrd_value_t), value_count, fh);
+        fwrite(rrd->rrd_value + (rra_offset + num_rows-1 - cur_row) * ds_cnt,
+               sizeof(rrd_value_t), (cur_row+1)*ds_cnt, fh);
+
+        fwrite(rrd->rrd_value + rra_offset * ds_cnt,
+               sizeof(rrd_value_t), (num_rows-1 - cur_row)*ds_cnt, fh);
+
+        rra_offset += num_rows;
+    }

 
     /* lets see if we had an error */
     if (ferror(fh)) {
 
     /* lets see if we had an error */
     if (ferror(fh)) {


@@ -1032,6 +1042,7 @@ int rrd_restore(
 {
     rrd_t    *rrd;
 
 {
     rrd_t    *rrd;
 

+    srandom((unsigned int)time(NULL) + (unsigned int)getpid());

     /* init rrd clean */
     optind = 0;
     opterr = 0;         /* initialize getopt */
     /* init rrd clean */
     optind = 0;
     opterr = 0;         /* initialize getopt */