Changeset 2770

Timestamp:

Jul 11, 2012, 4:44:45 PM (10 years ago)

Author:

Peter

Message:

change back to RNG being a singleton, which now stores gsl_rng* in a thread_specific_ptr<gsl_rng>. refs #568

Location:

trunk/yat/random

Files:

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

trunk/yat/random/random.cc

@@ -34 +34 @@
 namespace random {
 
-  boost::thread_specific_ptr<RNG> RNG::instance_;
+  RNG* RNG::instance_=NULL;
 
   RNG::RNG(void)
+    : rng_(gsl_rng_free)
   {
       // support rng/seed changes through environment vars
     if (!gsl_rng_env_setup())
       throw utility::GSL_error("RNG::RNG unknown generator");
-    if (!(rng_=gsl_rng_alloc(gsl_rng_default)))
-      throw utility::GSL_error("RNG::RNG failed to allocate memory");
   }
 
@@ -48 +47 @@
   RNG::~RNG(void)
   {
-    gsl_rng_free(rng_);
-    rng_=NULL;
   }
 
@@ -55 +52 @@
   RNG* RNG::instance(void)
   {
-    if (instance_.get()==NULL)
-      instance_.reset(new RNG);
-    return instance_.get();
+    if (instance_==NULL)
+      instance_ = new RNG;
+    return instance_;
   }
 
@@ -63 +60 @@
   unsigned long RNG::max(void) const
   {
-    return gsl_rng_max(rng_);
+    return gsl_rng_max(rng());
   }
 
@@ -69 +66 @@
   unsigned long RNG::min(void) const
   {
-    return gsl_rng_min(rng_);
+    return gsl_rng_min(rng());
   }
 
@@ -75 +72 @@
   std::string RNG::name(void) const
   {
-    return gsl_rng_name(rng_);
+    return gsl_rng_name(rng());
   }
 
@@ -81 +78 @@
   const gsl_rng* RNG::rng(void) const
   {
-    return rng_;
+    if (rng_.get()==NULL)
+      rng_alloc();
+    return rng_.get();
+  }
+
+
+  void RNG::rng_alloc(void) const
+  {
+    assert(rng_.get()==NULL);
+    gsl_rng* rng = gsl_rng_alloc(gsl_rng_default);
+    if (!rng)
+      throw utility::GSL_error("RNG failed to allocate memory");
+    rng_.reset(rng);
   }
 
@@ -87 +96 @@
   void RNG::seed(unsigned long s) const
   {
-    gsl_rng_set(rng_,s);
+    gsl_rng_set(rng(),s);
   }
 
@@ -108 +117 @@
   int RNG::set_state(const RNG_state& state)
   {
-    return gsl_rng_memcpy(rng_, state.rng());
+    if (rng_.get()==NULL)
+      rng_alloc();
+    return gsl_rng_memcpy(rng_.get(), state.rng());
   }
 
@@ -117 +128 @@
     clone(*rng->rng());
   }
-  
+
 
   RNG_state::RNG_state(const RNG_state& state)
@@ -123 +134 @@
     clone(*state.rng());
   }
-  
+
 
   RNG_state::~RNG_state(void)

trunk/yat/random/random.h

@@ -6 +6 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009, 2010, 2011 Peter Johansson
+  Copyright (C) 2009, 2010, 2011, 2012 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -82 +82 @@
   {
   public:
-    /**
-       \brief destructor
-     */
-    // FIXME should be private(?) but have problems with
-    // thread_specific_ptr<RNG> that want to destruct.
-    virtual ~RNG(void);
 
     ///
@@ -171 +165 @@
     RNG& operator=(const RNG&);
 
-    static boost::thread_specific_ptr<RNG> instance_;
-    gsl_rng* rng_;
+    virtual ~RNG(void);
+    void rng_alloc(void) const;
+
+    static RNG* instance_;
+    mutable boost::thread_specific_ptr<gsl_rng> rng_;
   };