[Getfem-commits] r4632 - in /trunk/getfem/src: getfem/getfem_im_data.h getfem_im_data.cc

[andriy . andreykiv]

Author: andrico
Date: Tue Apr 29 17:27:39 2014
New Revision: 4632

URL: http://svn.gna.org/viewcvs/getfem?rev=4632&view=rev
Log:
object specific locks for im_data

Modified:
    trunk/getfem/src/getfem/getfem_im_data.h
    trunk/getfem/src/getfem_im_data.cc

Modified: trunk/getfem/src/getfem/getfem_im_data.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_im_data.h?rev=4632&r1=4631&r2=4632&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_im_data.h    (original)
+++ trunk/getfem/src/getfem/getfem_im_data.h    Tue Apr 29 17:27:39 2014
@@ -332,6 +332,7 @@
     size_type              filtered_region_;
     bgeot::multi_index     tensor_size_;
     size_type              nb_tensor_elem_;
+    lock_factory           locks_;
   };
 }
 #endif /* GETFEM_IM_DATA_H__  */

Modified: trunk/getfem/src/getfem_im_data.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_im_data.cc?rev=4632&r1=4631&r2=4632&view=diff
==============================================================================
--- trunk/getfem/src/getfem_im_data.cc  (original)
+++ trunk/getfem/src/getfem_im_data.cc  Tue Apr 29 17:27:39 2014
@@ -8,7 +8,9 @@
                    bgeot::multi_index tensorSize,
                    size_type filteredRegion)
     :im_(meshIm), nb_filtered_index_(0), nb_index_(0),
-    filtered_region_(filteredRegion) {
+    filtered_region_(filteredRegion),
+    locks_()
+  {
     set_tensor_size(tensorSize);
     add_dependency(im_);
     update_index_();
@@ -25,7 +27,7 @@
   }
     
   void im_data::update_index_() const {
-    omp_guard lock;
+    local_guard lock = locks_.get_lock();
     nb_index_         = 0;      
     size_type nElement = im_.convex_index().last_true() + 1;
     int_point_index_.clear();