sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update random come to always have explict min/max

Browse source 
--HG--
extra : convert_revision : a2d1f6f8aa1df24ea524792f687f4d3ee31101f0
This commit is contained in:
Ali Saidi 2005-11-11 18:41:45 -05:00
parent 4410876773
commit 60480de7c3
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
base/random.cc
View file

@ -63,18 +63,18 @@ getLong()
} }
int64_t int64_t
getUniform(int64_t maxmin) getUniform(int64_t min, int64_t max)
{ {
double r; double r;
r = (drand48() - 0.500) * 2 * maxmin; r = drand48() * (max-min) + min;
return (int64_t)round(r); return (int64_t)round(r);
} }
uint64_t uint64_t
getUniformPos(uint64_t max) getUniformPos(uint64_t min, uint64_t max)
{ {
double r; double r;
r = drand48() * 2 * max; r = drand48() * (max-min) + min;
return (uint64_t)round(r); return (uint64_t)round(r);
} }

36
base/random.hh
View file

@ -33,8 +33,8 @@
long getLong(); long getLong();
double getDouble(); double getDouble();
uint64_t getUniformPos(uint64_t max); uint64_t getUniformPos(uint64_t min, uint64_t max);
int64_t getUniform(int64_t max); int64_t getUniform(int64_t min, int64_t max);
template <typename T> template <typename T>
struct Random; struct Random;
@ -44,8 +44,8 @@ template<> struct Random<int8_t>
static int8_t get() static int8_t get()
{ return getLong() & (int8_t)-1; } { return getLong() & (int8_t)-1; }
static int8_t uniform(int8_t maxmin) static int8_t uniform(int8_t min, int8_t max)
{ return getUniform(maxmin); } { return getUniform(min, max); }
}; };
template<> struct Random<uint8_t> template<> struct Random<uint8_t>
@ -53,8 +53,8 @@ template<> struct Random<uint8_t>
static uint8_t get() static uint8_t get()
{ return getLong() & (uint8_t)-1; } { return getLong() & (uint8_t)-1; }
static uint8_t uniform(uint8_t max) static uint8_t uniform(uint8_t min, uint8_t max)
{ return getUniformPos(max); } { return getUniformPos(min, max); }
}; };
template<> struct Random<int16_t> template<> struct Random<int16_t>
@ -62,8 +62,8 @@ template<> struct Random<int16_t>
static int16_t get() static int16_t get()
{ return getLong() & (int16_t)-1; } { return getLong() & (int16_t)-1; }
static int16_t uniform(int16_t maxmin) static int16_t uniform(int16_t min, int16_t max)
{ return getUniform(maxmin); } { return getUniform(min, max); }
}; };
template<> struct Random<uint16_t> template<> struct Random<uint16_t>
@ -71,8 +71,8 @@ template<> struct Random<uint16_t>
static uint16_t get() static uint16_t get()
{ return getLong() & (uint16_t)-1; } { return getLong() & (uint16_t)-1; }
static uint16_t uniform(uint16_t max) static uint16_t uniform(uint16_t min, uint16_t max)
{ return getUniformPos(max); } { return getUniformPos(min, max); }
}; };
template<> struct Random<int32_t> template<> struct Random<int32_t>
@ -80,8 +80,8 @@ template<> struct Random<int32_t>
static int32_t get() static int32_t get()
{ return (int32_t)getLong(); } { return (int32_t)getLong(); }
static int32_t uniform(int32_t maxmin) static int32_t uniform(int32_t min, int32_t max)
{ return getUniform(maxmin); } { return getUniform(min, max); }
}; };
template<> struct Random<uint32_t> template<> struct Random<uint32_t>
@ -89,8 +89,8 @@ template<> struct Random<uint32_t>
static uint32_t get() static uint32_t get()
{ return (uint32_t)getLong(); } { return (uint32_t)getLong(); }
static uint32_t uniform(uint32_t max) static uint32_t uniform(uint32_t min, uint32_t max)
{ return getUniformPos(max); } { return getUniformPos(min, max); }
}; };
template<> struct Random<int64_t> template<> struct Random<int64_t>
@ -98,8 +98,8 @@ template<> struct Random<int64_t>
static int64_t get() static int64_t get()
{ return (int64_t)getLong() << 32 || (uint64_t)getLong(); } { return (int64_t)getLong() << 32 || (uint64_t)getLong(); }
static int64_t uniform(int64_t maxmin) static int64_t uniform(int64_t min, int64_t max)
{ return getUniform(maxmin); } { return getUniform(min, max); }
}; };
template<> struct Random<uint64_t> template<> struct Random<uint64_t>
@ -107,8 +107,8 @@ template<> struct Random<uint64_t>
static uint64_t get() static uint64_t get()
{ return (uint64_t)getLong() << 32 || (uint64_t)getLong(); } { return (uint64_t)getLong() << 32 || (uint64_t)getLong(); }
static uint64_t uniform(uint64_t max) static uint64_t uniform(uint64_t min, uint64_t max)
{ return getUniformPos(max); } { return getUniformPos(min, max); }
}; };
template<> struct Random<float> template<> struct Random<float>

2
dev/etherlink.cc
View file

@ -162,7 +162,7 @@ EtherLink::Link::transmit(PacketPtr pkt)
Tick delay = (Tick)ceil(((double)pkt->length * ticksPerByte) + 1.0); Tick delay = (Tick)ceil(((double)pkt->length * ticksPerByte) + 1.0);
if (delayVar != 0) { if (delayVar != 0) {
Random<Tick> var; Random<Tick> var;
delay += var.uniform(delayVar); delay += var.uniform(0, delayVar);
} }
DPRINTF(Ethernet, "scheduling packet: delay=%d, (rate=%f)\n", DPRINTF(Ethernet, "scheduling packet: delay=%d, (rate=%f)\n",
delay, ticksPerByte); delay, ticksPerByte);