[ftm-svn] SF.net SVN: ftm:[3748] trunk/ftm/ftmlib/classes/ftmdatagui.c

[<bor...@us...>]

Revision: 3748
          http://sourceforge.net/p/ftm/code/3748
Author:   borghesi
Date:     2020-07-22 11:09:12 +0000 (Wed, 22 Jul 2020)
Log Message:
-----------


Modified Paths:
--------------
    trunk/ftm/ftmlib/classes/ftmdatagui.c

Modified: trunk/ftm/ftmlib/classes/ftmdatagui.c
===================================================================
--- trunk/ftm/ftmlib/classes/ftmdatagui.c	2020-07-17 15:55:45 UTC (rev 3747)
+++ trunk/ftm/ftmlib/classes/ftmdatagui.c	2020-07-22 11:09:12 UTC (rev 3748)
@@ -1561,6 +1561,7 @@
         if(value < vmin) vmin = value;
       }
     }
+    mat_unlock(self);
   }
   *max = vmax;
   *min = vmin;
@@ -1617,6 +1618,7 @@
         }
       }
     }
+    mat_unlock(self);
   }
   
   *max1 = vmax1;
@@ -1644,6 +1646,8 @@
     fts_atom_t *val;
     float value;
     
+    mat_lock(self);
+    
     for(i = 0; i < m; i ++)
     {
       val = mat_get_element(self, i, columnIndex);
@@ -1664,6 +1668,8 @@
     
     if(meanOfSquare > squareOfmean)
       vstddev = sqrt(meanOfSquare - squareOfmean);
+    
+    mat_unlock(self);
   }
   
   *mean = vmean;
@@ -2243,6 +2249,7 @@
   double vmin2 = 0.0;
   float val;
   
+  fmat_lock(self);
   float *ptr = fmat_get_ptr(self) + onset;
   int size = fmat_get_m(self) * fmat_get_n(self);
 
@@ -2269,6 +2276,7 @@
       if(val > vmax2 && val < vmax1) vmax2 = val;
     }
   }
+  fmat_unlock(self);
   
   *max1 = vmax1;
   *min1 = vmin1;
@@ -2499,6 +2507,7 @@
   double vmin2 = 0.0;
   float val;
   
+  fmat_lock(self);
   float *ptr = fmat_get_ptr(self) + index;
   int size = fmat_get_m(self) * fmat_get_n(self);
   
@@ -2525,6 +2534,7 @@
       if(val > vmax2 && val < vmax1) vmax2 = val;
     }
   }
+  fmat_unlock(self);
   
   *max1 = vmax1;
   *min1 = vmin1;
@@ -3292,6 +3302,8 @@
   double vmin2 = 0.0;
   int size = self->m * self->n;
   
+  fmat_lock(self);
+  
   if(size > 0 && self->values != NULL)
   {
     int i;
@@ -3325,6 +3337,7 @@
       }
     }
   }
+  fmat_unlock(self);
   
   *max1 = vmax1;
   *min1 = vmin1;
@@ -4181,7 +4194,6 @@
 fvec_gui_wave_append(void *obj, void *context, int onset, int num, double startValue, double endValue)
 {
   fvec_t *self = (fvec_t *)obj;
-  int i;
   float *ptr;
   int size, stride;
   
@@ -7743,6 +7755,9 @@
 track_gui_traces_get_traces_num(void *obj, void *context)
 {
   sequence_t *sequence = track_get_events((track_t *)obj);
+  
+  sequence_lock_read(sequence);
+  
   if(sequence_get_type(sequence) == fmat_class)
   {
     fmat_t *trace = NULL;
@@ -7752,6 +7767,8 @@
     if(trace != NULL) return trace->m;
   }
   
+  sequence_unlock(sequence);
+  
   return 1;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.