3ece6ab029
wierd ini files. The ini files are still used as an intermediate step, but a sophisticated python library exists to help build them more easily. SConscript: add the new embedded file stuff remove all of the old object description junk base/inifile.cc: base/inifile.hh: get rid of findDefault and findAppend since they were the source of much evil. base/trace.cc: For now, if we don't have the dprintf_stream set up, dump to standard out. We probably want a command line option for this. dev/alpha_console.cc: PioDevice now takes a platform parameter. All PioDevices must have a pio_latency parameter. We stick a dummy parameter in here for now until we get rid of the builder stuff. dev/alpha_console.hh: don't need Platform anymore dev/baddev.cc: PioDevice now takes a platform parameter. All PioDevices must have a pio_latency parameter. We stick a dummy parameter in here for now until we get rid of the builder stuff. Same for the platform parameter, though we just pass the PioDevice a null parameter since it isn't used by this device and it's quicker. dev/baddev.hh: fix #include guards dev/etherlink.cc: rename parameters. dev/ethertap.cc: rename parameters dev/ide_ctrl.cc: All devices need an address even if it will get overwritten later. dev/ide_disk.cc: use an enum for the drive ID stuff. rename disk_delay -> delay Actually, I think that we should implement "cable select" and have the controller tell the drive what it is. dev/io_device.cc: dev/io_device.hh: All IO devices take a Platform * dev/ns_gige.cc: all devices need an io_bus. rename header_bus to io_bus We don't need stuff for the interrupt controller since it's all in the platform now. dev/ns_gige.hh: We don't need stuff for the interrupt controller now since it's all in the platform. dev/pciconfigall.cc: Pass a dummy NULL to the PioDevice for the platform since we don't need one. dev/pcidev.cc: Move a bunch of common functionality into the PciDev dev/platform.hh: remove unneeded code dev/tsunami.cc: remove unused param dev/tsunami_cchip.cc: pass platform pointer dev/tsunami_io.cc: dev/tsunami_pchip.cc: dev/uart.cc: pass platform variable dev/uart.hh: don't need to keep a platform pointer. it's in the base class kern/linux/linux_system.cc: kern/tru64/tru64_system.cc: rename some parameters sim/builder.cc: clean up builder code. use more parameters from the config node. all sections with a type= are now created, the old mechanisms no longer work sim/builder.hh: remove some extra variables since they are found in the ConfigNode sim/main.cc: add a quick hack command line argument -X to dump out the embedded files. (probably should be fixed up a little.) accept .mpy files printing to the streams has to happen after the hierarchy is built since we're moving away from param contexts sim/param.cc: add parsing support for ranges sim/process.cc: isValid isn't very useful anymore. interpret the names stdout, stderr, cout, cerr for the file descriptors sim/pyconfig/SConscript: Add Action handlers for creating an embedded python file and for creating an embedded C file. use these action handlers to embed all objects found in the objects tree into the binary along with the importer and the m5config stuff sim/pyconfig/m5config.py: Major changes to the original configuration file generator. These changes largely involve implementing copy-on-write like semantics for all of the SimObjects. Real documentation must be written. sim/universe.cc: Universe becomes a SimObject since we don't really have the notion of param contexts in the python code. --HG-- rename : sim/pyconfig/m5configbase.py => sim/pyconfig/m5config.py extra : convert_revision : c353453e5beb91c37f15755998fc0d8858c6829a
287 lines
7.5 KiB
C++
287 lines
7.5 KiB
C++
/*
|
|
* Copyright (c) 2002-2004 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
/* @file
|
|
* Device module for modelling a fixed bandwidth full duplex ethernet link
|
|
*/
|
|
|
|
#include <cmath>
|
|
#include <deque>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/trace.hh"
|
|
#include "dev/etherdump.hh"
|
|
#include "dev/etherint.hh"
|
|
#include "dev/etherlink.hh"
|
|
#include "dev/etherpkt.hh"
|
|
#include "sim/builder.hh"
|
|
#include "sim/serialize.hh"
|
|
#include "sim/system.hh"
|
|
#include "sim/universe.hh"
|
|
|
|
using namespace std;
|
|
|
|
EtherLink::EtherLink(const string &name, EtherInt *i1, EtherInt *i2,
|
|
Tick speed, Tick dly, EtherDump *dump)
|
|
: SimObject(name)
|
|
{
|
|
double rate = ((double)ticksPerSecond * 8.0) / (double)speed;
|
|
Tick delay = US2Ticks(dly);
|
|
|
|
link1 = new Link(name + ".link1", rate, delay, dump);
|
|
link2 = new Link(name + ".link2", rate, delay, dump);
|
|
|
|
int1 = new Interface(name + ".int1", link1, link2);
|
|
int2 = new Interface(name + ".int2", link2, link1);
|
|
|
|
int1->setPeer(i1);
|
|
i1->setPeer(int1);
|
|
int2->setPeer(i2);
|
|
i2->setPeer(int2);
|
|
}
|
|
|
|
EtherLink::~EtherLink()
|
|
{
|
|
delete link1;
|
|
delete link2;
|
|
|
|
delete int1;
|
|
delete int2;
|
|
}
|
|
|
|
EtherLink::Interface::Interface(const string &name, Link *tx, Link *rx)
|
|
: EtherInt(name), txlink(tx)
|
|
{
|
|
tx->setTxInt(this);
|
|
rx->setRxInt(this);
|
|
}
|
|
|
|
EtherLink::Link::Link(const string &name, double rate, Tick delay,
|
|
EtherDump *d)
|
|
: objName(name), txint(NULL), rxint(NULL), ticksPerByte(rate),
|
|
linkDelay(delay), dump(d), doneEvent(this)
|
|
{}
|
|
|
|
void
|
|
EtherLink::serialize(ostream &os)
|
|
{
|
|
nameOut(os, name() + ".link1");
|
|
link1->serialize(os);
|
|
nameOut(os, name() + ".link2");
|
|
link2->serialize(os);
|
|
}
|
|
|
|
void
|
|
EtherLink::unserialize(Checkpoint *cp, const string §ion)
|
|
{
|
|
link1->unserialize(cp, section + ".link1");
|
|
link2->unserialize(cp, section + ".link2");
|
|
}
|
|
|
|
void
|
|
EtherLink::Link::txComplete(PacketPtr packet)
|
|
{
|
|
DPRINTF(Ethernet, "packet received: len=%d\n", packet->length);
|
|
DDUMP(EthernetData, packet->data, packet->length);
|
|
rxint->sendPacket(packet);
|
|
}
|
|
|
|
class LinkDelayEvent : public Event
|
|
{
|
|
protected:
|
|
EtherLink::Link *link;
|
|
PacketPtr packet;
|
|
|
|
// non-scheduling version for createForUnserialize()
|
|
LinkDelayEvent(EtherLink::Link *link);
|
|
|
|
public:
|
|
LinkDelayEvent(EtherLink::Link *link, PacketPtr pkt, Tick when);
|
|
|
|
void process();
|
|
|
|
virtual void serialize(ostream &os);
|
|
virtual void unserialize(Checkpoint *cp, const string §ion);
|
|
static Serializable *createForUnserialize(Checkpoint *cp,
|
|
const string §ion);
|
|
};
|
|
|
|
|
|
void
|
|
EtherLink::Link::txDone()
|
|
{
|
|
if (dump)
|
|
dump->dump(packet);
|
|
|
|
if (linkDelay > 0) {
|
|
DPRINTF(Ethernet, "packet delayed: delay=%d\n", linkDelay);
|
|
new LinkDelayEvent(this, packet, curTick + linkDelay);
|
|
} else {
|
|
txComplete(packet);
|
|
}
|
|
|
|
packet = 0;
|
|
assert(!busy());
|
|
|
|
txint->sendDone();
|
|
}
|
|
|
|
bool
|
|
EtherLink::Link::transmit(PacketPtr pkt)
|
|
{
|
|
if (busy()) {
|
|
DPRINTF(Ethernet, "packet not sent, link busy\n");
|
|
return false;
|
|
}
|
|
|
|
DPRINTF(Ethernet, "packet sent: len=%d\n", pkt->length);
|
|
DDUMP(EthernetData, pkt->data, pkt->length);
|
|
|
|
packet = pkt;
|
|
Tick delay = (Tick)ceil(((double)pkt->length * ticksPerByte) + 1.0);
|
|
DPRINTF(Ethernet, "scheduling packet: delay=%d, (rate=%f)\n",
|
|
delay, ticksPerByte);
|
|
doneEvent.schedule(curTick + delay);
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
EtherLink::Link::serialize(ostream &os)
|
|
{
|
|
bool packet_exists = packet;
|
|
SERIALIZE_SCALAR(packet_exists);
|
|
|
|
bool event_scheduled = doneEvent.scheduled();
|
|
SERIALIZE_SCALAR(event_scheduled);
|
|
if (event_scheduled) {
|
|
Tick event_time = doneEvent.when();
|
|
SERIALIZE_SCALAR(event_time);
|
|
}
|
|
|
|
if (packet_exists)
|
|
packet->serialize("packet", os);
|
|
}
|
|
|
|
void
|
|
EtherLink::Link::unserialize(Checkpoint *cp, const string §ion)
|
|
{
|
|
bool packet_exists;
|
|
UNSERIALIZE_SCALAR(packet_exists);
|
|
if (packet_exists) {
|
|
packet = new PacketData(16384);
|
|
packet->unserialize("packet", cp, section);
|
|
}
|
|
|
|
bool event_scheduled;
|
|
UNSERIALIZE_SCALAR(event_scheduled);
|
|
if (event_scheduled) {
|
|
Tick event_time;
|
|
UNSERIALIZE_SCALAR(event_time);
|
|
doneEvent.schedule(event_time);
|
|
}
|
|
}
|
|
|
|
LinkDelayEvent::LinkDelayEvent(EtherLink::Link *l)
|
|
: Event(&mainEventQueue), link(l)
|
|
{
|
|
setFlags(AutoSerialize);
|
|
setFlags(AutoDelete);
|
|
}
|
|
|
|
LinkDelayEvent::LinkDelayEvent(EtherLink::Link *l, PacketPtr p, Tick when)
|
|
: Event(&mainEventQueue), link(l), packet(p)
|
|
{
|
|
setFlags(AutoSerialize);
|
|
setFlags(AutoDelete);
|
|
schedule(when);
|
|
}
|
|
|
|
void
|
|
LinkDelayEvent::process()
|
|
{
|
|
link->txComplete(packet);
|
|
}
|
|
|
|
void
|
|
LinkDelayEvent::serialize(ostream &os)
|
|
{
|
|
paramOut(os, "type", string("LinkDelayEvent"));
|
|
Event::serialize(os);
|
|
SERIALIZE_OBJPTR(link);
|
|
|
|
packet->serialize("packet", os);
|
|
}
|
|
|
|
|
|
void
|
|
LinkDelayEvent::unserialize(Checkpoint *cp, const string §ion)
|
|
{
|
|
Event::unserialize(cp, section);
|
|
packet = new PacketData(16384);
|
|
packet->unserialize("packet", cp, section);
|
|
}
|
|
|
|
|
|
Serializable *
|
|
LinkDelayEvent::createForUnserialize(Checkpoint *cp, const string §ion)
|
|
{
|
|
EtherLink::Link *link;
|
|
UNSERIALIZE_OBJPTR(link);
|
|
return new LinkDelayEvent(link);
|
|
}
|
|
|
|
REGISTER_SERIALIZEABLE("LinkDelayEvent", LinkDelayEvent)
|
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherLink)
|
|
|
|
SimObjectParam<EtherInt *> int1;
|
|
SimObjectParam<EtherInt *> int2;
|
|
Param<Tick> speed;
|
|
Param<Tick> delay;
|
|
SimObjectParam<EtherDump *> dump;
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(EtherLink)
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(EtherLink)
|
|
|
|
INIT_PARAM(int1, "interface 1"),
|
|
INIT_PARAM(int2, "interface 2"),
|
|
INIT_PARAM_DFLT(speed, "link speed in bits per second", 100000000),
|
|
INIT_PARAM_DFLT(delay, "transmit delay of packets in us", 0),
|
|
INIT_PARAM_DFLT(dump, "object to dump network packets to", NULL)
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(EtherLink)
|
|
|
|
CREATE_SIM_OBJECT(EtherLink)
|
|
{
|
|
return new EtherLink(getInstanceName(), int1, int2, speed, delay, dump);
|
|
}
|
|
|
|
REGISTER_SIM_OBJECT("EtherLink", EtherLink)
|