From: Matwey V. Kornilov <matwey.kornilov@gmail.com>
Date: Fri, 9 Feb 2018 10:06:39 +0000 (+0300)
Subject: Do not use static variables in xtr() and ytr()
X-Git-Tag: v1.7.1~65^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F873%2Fhead;p=thirdparty%2Frrdtool-1.x.git

Do not use static variables in xtr() and ytr()

Using static variables for writting leads to race conditions. In order to keep
scale for axis we introduce x_pixie and y_pixie into image_desc_t.

Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
---

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index cd63faea..0b8179e9 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -247,13 +247,11 @@ int xtr(
     image_desc_t *im,
     time_t mytime)
 {
-    static double pixie;
-
     if (mytime == 0) {
-        pixie = (double) im->xsize / (double) (im->end - im->start);
+        im->x_pixie = (double) im->xsize / (double) (im->end - im->start);
         return im->xorigin;
     }
-    return (int) ((double) im->xorigin + pixie * (mytime - im->start));
+    return (int) ((double) im->xorigin + im->x_pixie * (mytime - im->start));
 }
 
 /* translate data values into y coordinates */
@@ -261,23 +259,22 @@ double ytr(
     image_desc_t *im,
     double value)
 {
-    static double pixie;
     double    yval;
 
     if (isnan(value)) {
         if (!im->logarithmic)
-            pixie = (double) im->ysize / (im->maxval - im->minval);
+            im->y_pixie = (double) im->ysize / (im->maxval - im->minval);
         else
-            pixie =
+            im->y_pixie =
                 (double) im->ysize / (log10(im->maxval) - log10(im->minval));
         yval = im->yorigin;
     } else if (!im->logarithmic) {
-        yval = im->yorigin - pixie * (value - im->minval);
+        yval = im->yorigin - im->y_pixie * (value - im->minval);
     } else {
         if (value < im->minval) {
             yval = im->yorigin;
         } else {
-            yval = im->yorigin - pixie * (log10(value) - log10(im->minval));
+            yval = im->yorigin - im->y_pixie * (log10(value) - log10(im->minval));
         }
     }
     return yval;
diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 180e08f1..ad57ffdd 100644
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -352,6 +352,8 @@ typedef struct image_desc_t {
     GHashTable* rrd_map;  /* a map of all rrd files in use for gdef entries */
     mutex_t *fontmap_mutex; /* Mutex for locking the global fontmap */
     enum image_init_en init_mode; /* do we need Cairo/Pango? */
+    double x_pixie; /* scale for X (see xtr() for reference) */
+    double y_pixie; /* scale for Y (see ytr() for reference) */
 } image_desc_t;
 
 /* Prototypes */