Changeset 15627

Timestamp:

Nov 15, 2007, 2:41:07 PM (18 years ago)

Author:

Paul Price

Message:

Don't always want to tell everyone what random seed we've chosen.

Location:

trunk/psLib/src/math

Files:

• psRandom.c (modified) (6 diffs)
• psRandom.h (modified) (2 diffs)

trunk/psLib/src/math/psRandom.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-10-17 02:20:24 $
+*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-11-16 00:41:07 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
 
 
-psU64 p_psRandomGetSystemSeed()
+psU64 p_psRandomGetSystemSeed(bool log)
 {
     FILE*  fd;
@@ -56 +56 @@
 
     // Send log message of the system seed value used
-    psLogMsg(__func__,PS_LOG_INFO,"System random seed value used = %" PRIx64, seedVal);
+    if (log) {
+        psLogMsg(__func__,PS_LOG_INFO,"System random seed value used = %" PRIx64, seedVal);
+    }
 
     return seedVal;
@@ -73 +75 @@
         myRNG->gsl = r;
         if(seed == 0) {
-            gsl_rng_set(myRNG->gsl,p_psRandomGetSystemSeed());
+            gsl_rng_set(myRNG->gsl, p_psRandomGetSystemSeed(true));
         } else {
-            gsl_rng_set(myRNG->gsl,seed);
+            gsl_rng_set(myRNG->gsl, seed);
         }
         myRNG->type = type;
@@ -81 +83 @@
 
     default:
-        psError(PS_ERR_UNEXPECTED_NULL,
-                true,
-                _("Unknown Random Number Generator Type"));
+        psError(PS_ERR_UNEXPECTED_NULL, true, _("Unknown Random Number Generator Type"));
         break;
     }
@@ -101 +101 @@
         // Check seed value to see if system seed should be used
         if(seed == 0) {
-            gsl_rng_set(rand->gsl,p_psRandomGetSystemSeed());
+            gsl_rng_set(rand->gsl,p_psRandomGetSystemSeed(true));
         } else {
             gsl_rng_set(rand->gsl, seed);

trunk/psLib/src/math/psRandom.h

@@ -7 +7 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-10-09 20:05:32 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-11-16 00:41:07 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
 } psRandom;
 
-psU64 p_psRandomGetSystemSeed();
+/// Get a seed from the system.
+///
+/// Tries /dev/random first, and then the system clock
+psU64 p_psRandomGetSystemSeed(bool log  ///< Print a log message about the choice of seed?
+    );
 
 /** Allocates a psRandom struct.