summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Raasch <sraasch@umich.edu>2003-10-30 15:16:00 -0500
committerSteve Raasch <sraasch@umich.edu>2003-10-30 15:16:00 -0500
commit48ce8b70e62a203b3aff4bacc35a2657c64fb762 (patch)
tree9fd50bbb0d8ee1276746311fdc1dae41ab0dd653
parent9dac0d3c568d8767a2022afaaf958455df012e42 (diff)
downloadgem5-48ce8b70e62a203b3aff4bacc35a2657c64fb762.tar.xz
Add serialization (which Nate now says we probably don't need)
--HG-- extra : convert_revision : e075fafdf6e72a424110a120e24ca71cb44cfb03
-rw-r--r--dev/ethertap.cc47
-rw-r--r--dev/ethertap.hh3
2 files changed, 50 insertions, 0 deletions
diff --git a/dev/ethertap.cc b/dev/ethertap.cc
index b99d46ce5..339e7ac78 100644
--- a/dev/ethertap.cc
+++ b/dev/ethertap.cc
@@ -163,6 +163,7 @@ EtherTap::detach()
{
DPRINTF(Ethernet, "EtherTap detached\n");
delete event;
+ event = 0;
close(socket);
socket = -1;
}
@@ -262,6 +263,52 @@ EtherTap::retransmit()
txEvent.schedule(curTick + 1000);
}
+//=====================================================================
+
+void
+EtherTap::serialize(ostream &os)
+{
+ SERIALIZE_SCALAR(socket);
+ SERIALIZE_SCALAR(buflen);
+ SERIALIZE_ARRAY((uint8_t *)buffer,buflen);
+ SERIALIZE_SCALAR(buffer_offset);
+ SERIALIZE_SCALAR(data_len);
+
+ bool tapevent_present = false;
+ if (event) {
+ tapevent_present = true;
+ SERIALIZE_SCALAR(tapevent_present);
+ event->serialize(os);
+ }
+ else {
+ SERIALIZE_SCALAR(tapevent_present);
+ }
+}
+
+void
+EtherTap::unserialize(Checkpoint *cp, const std::string &section)
+{
+ UNSERIALIZE_SCALAR(socket);
+ UNSERIALIZE_SCALAR(buflen);
+ UNSERIALIZE_ARRAY((uint8_t *)buffer,buflen);
+ UNSERIALIZE_SCALAR(buffer_offset);
+ UNSERIALIZE_SCALAR(data_len);
+
+ bool tapevent_present;
+ UNSERIALIZE_SCALAR(tapevent_present);
+ if (tapevent_present) {
+ event = new TapEvent(this, socket, POLLIN|POLLERR);
+
+ event->unserialize(cp,section);
+
+ if (event->queued()) {
+ pollQueue.schedule(event);
+ }
+ }
+}
+
+//=====================================================================
+
BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherTap)
SimObjectParam<EtherInt *> peer;
diff --git a/dev/ethertap.hh b/dev/ethertap.hh
index 6e99bd91d..e2b1f640f 100644
--- a/dev/ethertap.hh
+++ b/dev/ethertap.hh
@@ -96,6 +96,9 @@ class EtherTap : public EtherInt
virtual bool recvPacket(PacketPtr packet);
virtual void sendDone();
+
+ virtual void serialize(std::ostream &os);
+ virtual void unserialize(Checkpoint *cp, const std::string &section);
};
#endif // __ETHERTAP_HH__