[Getfem-commits] r4641 - in /trunk/getfem/src: bgeot_rtree.cc getfem/bgeot_rtree.h getfem_models.cc

[andriy . andreykiv]

Author: andrico
Date: Tue May  6 18:25:25 2014
New Revision: 4641

URL: http://svn.gna.org/viewcvs/getfem?rev=4641&view=rev
Log:
thread-safing RTree; 
removing time trace for matrix distribution in brick_call

Modified:
    trunk/getfem/src/bgeot_rtree.cc
    trunk/getfem/src/getfem/bgeot_rtree.h
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/src/bgeot_rtree.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/bgeot_rtree.cc?rev=4641&r1=4640&r2=4641&view=diff
==============================================================================
--- trunk/getfem/src/bgeot_rtree.cc     (original)
+++ trunk/getfem/src/bgeot_rtree.cc     Tue May  6 18:25:25 2014
@@ -241,6 +241,7 @@
  void rtree::build_tree() {
    //cout << "build tree\n";
    if (boxes.size() == 0) return;
+   getfem::local_guard lock = locks_.get_lock();
    assert(root == 0);
    pbox_cont b(boxes.size());
    pbox_cont::iterator b_it = b.begin();

Modified: trunk/getfem/src/getfem/bgeot_rtree.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_rtree.h?rev=4641&r1=4640&r2=4641&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_rtree.h       (original)
+++ trunk/getfem/src/getfem/bgeot_rtree.h       Tue May  6 18:25:25 2014
@@ -94,6 +94,7 @@
 
     box_cont boxes;
     rtree_elt_base *root;
+    getfem::lock_factory locks_;
   };
 
 }

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4641&r1=4640&r2=4641&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Tue May  6 18:25:25 2014
@@ -868,10 +868,9 @@
       for individual threads.*/
       {//brackets are needed because list_distro has constructor/destructor
         //semantics (as in RAII)
-        list_distro<complex_matlist> cmatlist(brick.cmatlist);
+          list_distro<complex_matlist> cmatlist(brick.cmatlist);
              list_distro<complex_veclist> cveclist(brick.cveclist[rhs_ind]);
              list_distro<complex_veclist> 
cveclist_sym(brick.cveclist_sym[rhs_ind]);
-        GMM_TRACE2("Matrix distribution took "<< gmm::uclock_sec()-time<<" 
s.");
         time = gmm::uclock_sec();
         /*running the assembly in parallel*/
              gmm::standard_locale locale;
@@ -911,9 +910,8 @@
              list_distro<real_matlist> rmatlist(brick.rmatlist);
              list_distro<real_veclist> rveclist(brick.rveclist[rhs_ind]);
              list_distro<real_veclist> 
rveclist_sym(brick.rveclist_sym[rhs_ind]);
-        // GMM_TRACE2("Matrix distribution took "<< gmm::uclock_sec()-time<<" 
s.");
-        time = gmm::uclock_sec();
-        /*running the assembly in parallel*/
+                 time = gmm::uclock_sec();
+          /*running the assembly in parallel*/
              gmm::standard_locale locale;
              open_mp_is_running_properly check; 
         #pragma omp parallel default(shared)