diff options
| -rw-r--r-- | configs/splash2/run.mpy | 4 | ||||
| -rw-r--r-- | dev/ns_gige.cc | 27 |
2 files changed, 22 insertions, 9 deletions
diff --git a/configs/splash2/run.mpy b/configs/splash2/run.mpy index a19dcdc93..800bff6f8 100644 --- a/configs/splash2/run.mpy +++ b/configs/splash2/run.mpy @@ -5,12 +5,12 @@ if 'SYSTEM' not in env: if env['SYSTEM'] == 'Simple': from SimpleConfig import * - BaseCPU.workload = Super.workload + BaseCPU.workload = parent.workload SimpleStandAlone.cpu = [ CPU() for i in xrange(int(env['NP'])) ] root = SimpleStandAlone elif env['SYSTEM'] == 'Detailed': from DetailedConfig import * - BaseCPU.workload = Super.workload + BaseCPU.workload = parent.workload DetailedStandAlone.cpu = [ DetailedCPU() for i in xrange(int(env['NP'])) ] root = DetailedStandAlone else: diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc index db1474d1c..53a881ef7 100644 --- a/dev/ns_gige.cc +++ b/dev/ns_gige.cc @@ -1597,8 +1597,10 @@ NSGigE::rxKick() DPRINTF(Ethernet, "ID is %d\n", ip->id()); TcpPtr tcp(ip); if (tcp) { - DPRINTF(Ethernet, "Src Port=%d, Dest Port=%d\n", - tcp->sport(), tcp->dport()); + DPRINTF(Ethernet, + "Src Port=%d, Dest Port=%d, Seq=%d, Ack=%d\n", + tcp->sport(), tcp->dport(), tcp->seq(), + tcp->ack()); } } } @@ -1803,14 +1805,15 @@ NSGigE::transmit() DPRINTF(Ethernet, "ID is %d\n", ip->id()); TcpPtr tcp(ip); if (tcp) { - DPRINTF(Ethernet, "Src Port=%d, Dest Port=%d\n", - tcp->sport(), tcp->dport()); + DPRINTF(Ethernet, + "Src Port=%d, Dest Port=%d, Seq=%d, Ack=%d\n", + tcp->sport(), tcp->dport(), tcp->seq(), tcp->ack()); } } } #endif - DDUMP(Ethernet, txFifo.front()->data, txFifo.front()->length); + DDUMP(EthernetData, txFifo.front()->data, txFifo.front()->length); txBytes += txFifo.front()->length; txPackets++; @@ -2296,8 +2299,18 @@ NSGigE::recvPacket(PacketPtr packet) } if (rxFifo.avail() < packet->length) { - DPRINTF(Ethernet, - "packet will not fit in receive buffer...packet dropped\n"); +#if TRACING_ON + IpPtr ip(packet); + TcpPtr tcp(ip); + if (ip) { + DPRINTF(Ethernet, + "packet won't fit in receive buffer...pkt ID %d dropped\n", + ip->id()); + if (tcp) { + DPRINTF(Ethernet, "Seq=%d\n", tcp->seq()); + } + } +#endif droppedPackets++; devIntrPost(ISR_RXORN); return false; |