Changeset 2838 for trunk/yat/random/random.cc

Timestamp:

Sep 17, 2012, 1:12:53 AM (11 years ago)

Author:

Peter

Message:

merge release 0.9 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• yat/random/random.cc (modified) (3 diffs)

trunk/yat/random/random.cc

@@ -24 +24 @@
 #include "yat/statistics/Histogram.h"
 #include "yat/utility/Exception.h"
+
+#include <boost/thread/locks.hpp>
 
 #include <cassert>
@@ -93 +95 @@
     if (!rng)
       throw utility::GSL_error("RNG failed to allocate memory");
+    boost::unique_lock<boost::mutex> lock(mutex_);
     gsl_rng_set(rng, seed_);
     // bump seed to avoid subsequent gsl_rng to be identical
@@ -98 +101 @@
     // rng_ owns rng and takes care of deallocation
     rng_.reset(rng);
-  }
+  } // lock is released here
 
 
   void RNG::seed(unsigned long s) const
   {
+    boost::unique_lock<boost::mutex> lock(mutex_);
     gsl_rng_set(rng(),s);
     seed_ = s+1;
-  }
+  } // lock is released here