Merge zizzer:/bk/m5 into zamp.eecs.umich.edu:/z/rdreslin/m5bk/clean

--HG--
extra : convert_revision : b8e4d9c2901c4c784ecca351fd34a3f5a2845473
This commit is contained in:
Ron Dreslinski 2004-02-20 12:45:11 -05:00
commit ee799f47d5
2 changed files with 58 additions and 0 deletions

View file

@ -42,6 +42,7 @@
#include "dev/etherpkt.hh"
#include "sim/builder.hh"
#include "sim/universe.hh"
#include "sim/system.hh"
using namespace std;
@ -84,6 +85,20 @@ EtherLink::Link::Link(const std::string &name, double rate, EtherDump *d)
dump(d), event(&mainEventQueue, this)
{}
void
EtherLink::serialize(ostream &os)
{
link1->serialize(os);
link2->serialize(os);
}
void
EtherLink::unserialize(Checkpoint *cp, const string &section)
{
link1->unserialize(cp, section);
link2->unserialize(cp, section);
}
void
EtherLink::Link::txDone()
{
@ -121,6 +136,42 @@ EtherLink::Link::transmit(PacketPtr &pkt)
return true;
}
void
EtherLink::Link::serialize(ostream &os)
{
bool packetExists = false;
if (packet) packetExists = true;
SERIALIZE_SCALAR(packetExists);
if (packetExists) {
nameOut(os, csprintf("%s.linkPacket", name()));
packet->serialize(os);
}
bool event_scheduled = event.scheduled();
SERIALIZE_SCALAR(event_scheduled);
if (event_scheduled) {
SERIALIZE_SCALAR(event.when());
}
}
void
EtherLink::Link::unserialize(Checkpoint *cp, const string &section)
{
bool event_scheduled, packetExists;
Tick eventTime;
UNSERIALIZE_SCALAR(packetExists);
if (packetExists) {
packet = new EtherPacket;
packet->unserialize(cp, csprintf("%s.linkPacket", section));
}
UNSERIALIZE_SCALAR(event_scheduled);
if (event_scheduled) {
UNSERIALIZE_SCALAR(eventTime);
event.schedule(eventTime);
}
}
BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherLink)
SimObjectParam<EtherInt *> interface1;

View file

@ -96,6 +96,9 @@ class EtherLink : public SimObject
void setTxInt(Interface *i) { assert(!txint); txint = i; }
void setRxInt(Interface *i) { assert(!rxint); rxint = i; }
virtual void serialize(std::ostream &os);
virtual void unserialize(Checkpoint *cp, const std::string &section);
};
/*
@ -122,6 +125,10 @@ class EtherLink : public SimObject
EtherLink(const std::string &name, EtherInt *i1, EtherInt *i2,
Tick speed, EtherDump *dump);
virtual ~EtherLink();
virtual void serialize(std::ostream &os);
virtual void unserialize(Checkpoint *cp, const std::string &section);
};
#endif // __ETHERLINK_HH__