Update random come to always have explict min/max

--HG--
extra : convert_revision : a2d1f6f8aa1df24ea524792f687f4d3ee31101f0

diff --git a/base/random.cc b/base/random.cc
index cfa94b5e3806398fb7e6ba01a49657e75c1ab14e..4aac14101b3ca96a9f12931d20dd1ce8f5f246a8 100644 (file)
--- a/base/random.cc
+++ b/base/random.cc
@@ -63,18 +63,18 @@ getLong()
 }
 
 int64_t
-getUniform(int64_t maxmin)
+getUniform(int64_t min, int64_t max)
 {
     double r;
-    r = (drand48() - 0.500) * 2 * maxmin;
+    r = drand48() * (max-min) + min;
     return (int64_t)round(r);
 }
 
 uint64_t
-getUniformPos(uint64_t max)
+getUniformPos(uint64_t min, uint64_t max)
 {
     double r;
-    r = drand48() * 2 * max;
+    r = drand48() * (max-min) + min;
     return (uint64_t)round(r);
 }
 

diff --git a/base/random.hh b/base/random.hh
index eac91a53cda1513456d6e6d53709de3543d6773a..def7a4bcefaaa26343a04004a9f906718b29aeeb 100644 (file)
--- a/base/random.hh
+++ b/base/random.hh
@@ -33,8 +33,8 @@
 
 long getLong();
 double getDouble();
-uint64_t getUniformPos(uint64_t max);
-int64_t getUniform(int64_t max);
+uint64_t getUniformPos(uint64_t min, uint64_t max);
+int64_t getUniform(int64_t min, int64_t max);
 
 template <typename T>
 struct Random;
@@ -44,8 +44,8 @@ template<> struct Random<int8_t>
     static int8_t get()
     { return getLong() & (int8_t)-1; }
 
-    static int8_t uniform(int8_t maxmin)
-    { return getUniform(maxmin); }
+    static int8_t uniform(int8_t min, int8_t max)
+    { return getUniform(min, max); }
 };
 
 template<> struct Random<uint8_t>
@@ -53,8 +53,8 @@ template<> struct Random<uint8_t>
     static uint8_t get()
     { return getLong() & (uint8_t)-1; }
 
-    static uint8_t uniform(uint8_t max)
-    { return getUniformPos(max); }
+    static uint8_t uniform(uint8_t min, uint8_t max)
+    { return getUniformPos(min, max); }
 };
 
 template<> struct Random<int16_t>
@@ -62,8 +62,8 @@ template<> struct Random<int16_t>
     static int16_t get()
     { return getLong() & (int16_t)-1; }
 
-    static int16_t uniform(int16_t maxmin)
-    { return getUniform(maxmin); }
+    static int16_t uniform(int16_t min, int16_t max)
+    { return getUniform(min, max); }
 };
 
 template<> struct Random<uint16_t>
@@ -71,8 +71,8 @@ template<> struct Random<uint16_t>
     static uint16_t get()
     { return getLong() & (uint16_t)-1; }
 
-    static uint16_t uniform(uint16_t max)
-    { return getUniformPos(max); }
+    static uint16_t uniform(uint16_t min, uint16_t max)
+    { return getUniformPos(min, max); }
 };
 
 template<> struct Random<int32_t>
@@ -80,8 +80,8 @@ template<> struct Random<int32_t>
     static int32_t get()
     { return (int32_t)getLong(); }
 
-    static int32_t uniform(int32_t maxmin)
-    { return getUniform(maxmin); }
+    static int32_t uniform(int32_t min, int32_t max)
+    { return getUniform(min, max); }
 };
 
 template<> struct Random<uint32_t>
@@ -89,8 +89,8 @@ template<> struct Random<uint32_t>
     static uint32_t get()
     { return (uint32_t)getLong(); }
 
-    static uint32_t uniform(uint32_t max)
-    { return getUniformPos(max); }
+    static uint32_t uniform(uint32_t min, uint32_t max)
+    { return getUniformPos(min, max); }
 };
 
 template<> struct Random<int64_t>
@@ -98,8 +98,8 @@ template<> struct Random<int64_t>
     static int64_t get()
     { return (int64_t)getLong() << 32 || (uint64_t)getLong(); }
 
-    static int64_t uniform(int64_t maxmin)
-    { return getUniform(maxmin); }
+    static int64_t uniform(int64_t min, int64_t max)
+    { return getUniform(min, max); }
 };
 
 template<> struct Random<uint64_t>
@@ -107,8 +107,8 @@ template<> struct Random<uint64_t>
     static uint64_t get()
     { return (uint64_t)getLong() << 32 || (uint64_t)getLong(); }
 
-    static uint64_t uniform(uint64_t max)
-    { return getUniformPos(max); }
+    static uint64_t uniform(uint64_t min, uint64_t max)
+    { return getUniformPos(min, max); }
 };
 
 template<> struct Random<float>

diff --git a/dev/etherlink.cc b/dev/etherlink.cc
index e0f45c3bfccbfacfb0d7f589350adc07b82b8bb9..f68332926d1094b679c81bf9a677c3f66d255bf7 100644 (file)
--- a/dev/etherlink.cc
+++ b/dev/etherlink.cc
@@ -162,7 +162,7 @@ EtherLink::Link::transmit(PacketPtr pkt)
     Tick delay = (Tick)ceil(((double)pkt->length * ticksPerByte) + 1.0);
     if (delayVar != 0) {
         Random<Tick> var;
-        delay +=  var.uniform(delayVar);
+        delay +=  var.uniform(0, delayVar);
     }
     DPRINTF(Ethernet, "scheduling packet: delay=%d, (rate=%f)\n",
             delay, ticksPerByte);