diff options
author | Andrew Schultz <alschult@umich.edu> | 2003-10-31 17:32:04 -0500 |
---|---|---|
committer | Andrew Schultz <alschult@umich.edu> | 2003-10-31 17:32:04 -0500 |
commit | 2ab51fbcdb1d26d635875174eb23f60d6f9dc6bb (patch) | |
tree | a24dc79dca85e80ac7580a24a71299a939f07748 /dev/etherlink.hh | |
parent | b5fc3af142cfe71e6cb331dbed3b177193553a58 (diff) | |
download | gem5-2ab51fbcdb1d26d635875174eb23f60d6f9dc6bb.tar.xz |
Changed the naming of Serializeable derived objects. Serializeable no longer has
objName as a member, instead it has the pure virtual function name(). SimObject
now has a objName member, and all classes derived directly from Serializeable
have to implement a name() function (which now makes them unique by pointer value)
cpu/simple_cpu/simple_cpu.cc:
Change initialization of Event to get rid of Serializeable naming
dev/etherlink.cc:
dev/etherlink.hh:
Seralizeable derived naming changes
sim/eventq.cc:
Serializeable derived naming changes, also changed serialization process so it
doesn't need to use nameChildren
sim/eventq.hh:
Serializeable derived naming changes, remove constructor for specifying event name
sim/serialize.cc:
Serializeable derived naming changes, remove setName function and the child naming
pass for serialization
sim/serialize.hh:
Serializeable derived naming changes, removed nameChildren, setName
sim/sim_object.cc:
sim/sim_object.hh:
Serializeable derived naming changes
--HG--
extra : convert_revision : 67bcc275b6c210f7049f98a1ad0d22e8f5596a63
Diffstat (limited to 'dev/etherlink.hh')
-rw-r--r-- | dev/etherlink.hh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dev/etherlink.hh b/dev/etherlink.hh index a88fe24df..ea7bdcbcc 100644 --- a/dev/etherlink.hh +++ b/dev/etherlink.hh @@ -54,6 +54,8 @@ class EtherLink : public SimObject */ class Link : public Serializeable { protected: + std::string objName; + Interface *txint; Interface *rxint; @@ -87,6 +89,8 @@ class EtherLink : public SimObject Link(const std::string &name, double rate, EtherDump *dump); ~Link() {} + virtual std::string name() const { return objName; } + bool busy() const { return (bool)packet; } bool transmit(PacketPtr packet); |