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
343 lines
8.5 KiB
C++
343 lines
8.5 KiB
C++
/*
|
|
* Copyright (c) 2003-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
|
|
* Interface to connect a simulated ethernet device to the real world
|
|
*/
|
|
|
|
#if defined(__OpenBSD__) || defined(__APPLE__)
|
|
#include <sys/param.h>
|
|
#endif
|
|
#include <netinet/in.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <deque>
|
|
#include <string>
|
|
|
|
#include "base/misc.hh"
|
|
#include "base/pollevent.hh"
|
|
#include "base/socket.hh"
|
|
#include "base/trace.hh"
|
|
#include "dev/etherdump.hh"
|
|
#include "dev/etherint.hh"
|
|
#include "dev/etherpkt.hh"
|
|
#include "dev/ethertap.hh"
|
|
#include "sim/builder.hh"
|
|
|
|
using namespace std;
|
|
|
|
/**
|
|
*/
|
|
class TapListener
|
|
{
|
|
protected:
|
|
/**
|
|
*/
|
|
class Event : public PollEvent
|
|
{
|
|
protected:
|
|
TapListener *listener;
|
|
|
|
public:
|
|
Event(TapListener *l, int fd, int e)
|
|
: PollEvent(fd, e), listener(l) {}
|
|
|
|
virtual void process(int revent) { listener->accept(); }
|
|
};
|
|
|
|
friend class Event;
|
|
Event *event;
|
|
|
|
protected:
|
|
ListenSocket listener;
|
|
EtherTap *tap;
|
|
int port;
|
|
|
|
public:
|
|
TapListener(EtherTap *t, int p)
|
|
: event(NULL), tap(t), port(p) {}
|
|
~TapListener() { if (event) delete event; }
|
|
|
|
void accept();
|
|
void listen();
|
|
};
|
|
|
|
void
|
|
TapListener::listen()
|
|
{
|
|
while (!listener.listen(port, true)) {
|
|
DPRINTF(Ethernet, "TapListener(listen): Can't bind port %d\n", port);
|
|
port++;
|
|
}
|
|
|
|
ccprintf(cerr, "Listening for tap connection on port %d\n", port);
|
|
event = new Event(this, listener.getfd(), POLLIN|POLLERR);
|
|
pollQueue.schedule(event);
|
|
}
|
|
|
|
void
|
|
TapListener::accept()
|
|
{
|
|
if (!listener.islistening())
|
|
panic("TapListener(accept): cannot accept if we're not listening!");
|
|
|
|
int sfd = listener.accept(true);
|
|
if (sfd != -1)
|
|
tap->attach(sfd);
|
|
}
|
|
|
|
/**
|
|
*/
|
|
class TapEvent : public PollEvent
|
|
{
|
|
protected:
|
|
EtherTap *tap;
|
|
|
|
public:
|
|
TapEvent(EtherTap *_tap, int fd, int e)
|
|
: PollEvent(fd, e), tap(_tap) {}
|
|
virtual void process(int revent) { tap->process(revent); }
|
|
};
|
|
|
|
EtherTap::EtherTap(const string &name, EtherDump *d, int port, int bufsz)
|
|
: EtherInt(name), event(NULL), socket(-1), buflen(bufsz), dump(d),
|
|
txEvent(this)
|
|
{
|
|
buffer = new char[buflen];
|
|
listener = new TapListener(this, port);
|
|
listener->listen();
|
|
}
|
|
|
|
EtherTap::~EtherTap()
|
|
{
|
|
if (event)
|
|
delete event;
|
|
if (buffer)
|
|
delete [] buffer;
|
|
|
|
delete listener;
|
|
}
|
|
|
|
void
|
|
EtherTap::attach(int fd)
|
|
{
|
|
if (socket != -1)
|
|
close(fd);
|
|
|
|
buffer_offset = 0;
|
|
data_len = 0;
|
|
socket = fd;
|
|
DPRINTF(Ethernet, "EtherTap attached\n");
|
|
event = new TapEvent(this, socket, POLLIN|POLLERR);
|
|
pollQueue.schedule(event);
|
|
}
|
|
|
|
void
|
|
EtherTap::detach()
|
|
{
|
|
DPRINTF(Ethernet, "EtherTap detached\n");
|
|
delete event;
|
|
event = 0;
|
|
close(socket);
|
|
socket = -1;
|
|
}
|
|
|
|
bool
|
|
EtherTap::recvPacket(PacketPtr packet)
|
|
{
|
|
if (dump)
|
|
dump->dump(packet);
|
|
|
|
DPRINTF(Ethernet, "EtherTap output len=%d\n", packet->length);
|
|
DDUMP(EthernetData, packet->data, packet->length);
|
|
u_int32_t len = htonl(packet->length);
|
|
write(socket, &len, sizeof(len));
|
|
write(socket, packet->data, packet->length);
|
|
|
|
recvDone();
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
EtherTap::sendDone()
|
|
{}
|
|
|
|
void
|
|
EtherTap::process(int revent)
|
|
{
|
|
if (revent & POLLERR) {
|
|
detach();
|
|
return;
|
|
}
|
|
|
|
char *data = buffer + sizeof(u_int32_t);
|
|
if (!(revent & POLLIN))
|
|
return;
|
|
|
|
if (buffer_offset < data_len + sizeof(u_int32_t)) {
|
|
int len = read(socket, buffer + buffer_offset, buflen - buffer_offset);
|
|
if (len == 0) {
|
|
detach();
|
|
return;
|
|
}
|
|
|
|
buffer_offset += len;
|
|
|
|
if (data_len == 0)
|
|
data_len = ntohl(*(u_int32_t *)buffer);
|
|
|
|
DPRINTF(Ethernet, "Received data from peer: len=%d buffer_offset=%d "
|
|
"data_len=%d\n", len, buffer_offset, data_len);
|
|
}
|
|
|
|
while (data_len != 0 && buffer_offset >= data_len + sizeof(u_int32_t)) {
|
|
PacketPtr packet;
|
|
packet = new PacketData(data_len);
|
|
packet->length = data_len;
|
|
memcpy(packet->data, data, data_len);
|
|
|
|
buffer_offset -= data_len + sizeof(u_int32_t);
|
|
assert(buffer_offset >= 0);
|
|
if (buffer_offset > 0) {
|
|
memmove(buffer, data + data_len, buffer_offset);
|
|
data_len = ntohl(*(u_int32_t *)buffer);
|
|
} else
|
|
data_len = 0;
|
|
|
|
DPRINTF(Ethernet, "EtherTap input len=%d\n", packet->length);
|
|
DDUMP(EthernetData, packet->data, packet->length);
|
|
if (!sendPacket(packet)) {
|
|
DPRINTF(Ethernet, "bus busy...buffer for retransmission\n");
|
|
packetBuffer.push(packet);
|
|
if (!txEvent.scheduled())
|
|
txEvent.schedule(curTick + 1000);
|
|
} else if (dump)
|
|
dump->dump(packet);
|
|
}
|
|
}
|
|
|
|
void
|
|
EtherTap::retransmit()
|
|
{
|
|
if (packetBuffer.empty())
|
|
return;
|
|
|
|
PacketPtr packet = packetBuffer.front();
|
|
if (sendPacket(packet)) {
|
|
if (dump)
|
|
dump->dump(packet);
|
|
DPRINTF(Ethernet, "EtherTap retransmit\n");
|
|
packetBuffer.front() = NULL;
|
|
packetBuffer.pop();
|
|
}
|
|
|
|
if (!packetBuffer.empty() && !txEvent.scheduled())
|
|
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 §ion)
|
|
{
|
|
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;
|
|
SimObjectParam<EtherDump *> dump;
|
|
Param<unsigned> port;
|
|
Param<unsigned> bufsz;
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(EtherTap)
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(EtherTap)
|
|
|
|
INIT_PARAM_DFLT(peer, "peer interface", NULL),
|
|
INIT_PARAM_DFLT(dump, "object to dump network packets to", NULL),
|
|
INIT_PARAM_DFLT(port, "tap port", 3500),
|
|
INIT_PARAM_DFLT(bufsz, "tap buffer size", 10000)
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(EtherTap)
|
|
|
|
|
|
CREATE_SIM_OBJECT(EtherTap)
|
|
{
|
|
EtherTap *tap = new EtherTap(getInstanceName(), dump, port, bufsz);
|
|
|
|
if (peer) {
|
|
tap->setPeer(peer);
|
|
peer->setPeer(tap);
|
|
}
|
|
|
|
return tap;
|
|
}
|
|
|
|
REGISTER_SIM_OBJECT("EtherTap", EtherTap)
|