Changeset 2833

Timestamp:

Sep 14, 2012, 9:42:09 AM (11 years ago)

Author:

Peter

Message:

fixes #720

Location:

branches/0.9-stable/yat/random

Files:

• random.cc (modified) (3 diffs)
• random.h (modified) (2 diffs)

branches/0.9-stable/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
 
 

branches/0.9-stable/yat/random/random.h

@@ -28 +28 @@
 
 #include <boost/concept_check.hpp>
+#include <boost/thread.hpp>
 #include <boost/thread/tss.hpp>
 
@@ -193 +194 @@
     mutable boost::thread_specific_ptr<gsl_rng> rng_;
     mutable unsigned long seed_;
+    // guard needs to be mutable because major mission for it is to protect seed_ against multi-access, and seed_ is mutable...
+    mutable boost::mutex mutex_;
   };