From af3a31f770fcd8b7e8c5171342cba155bef6dc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 1 Jan 2007 22:10:43 +0000 Subject: [PATCH] Calmed down the networking stack a lot - since it basically works, there is no reason to slow it down with debug output that much; this will also help investigating some issues where you just aren't interested in most of the output. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19672 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../network/datalink_protocols/arp/arp.cpp | 2 +- .../network/devices/ethernet/ethernet.cpp | 6 ++-- .../kernel/network/protocols/ipv4/ipv4.cpp | 2 +- .../network/protocols/tcp/BufferQueue.cpp | 2 +- .../network/protocols/tcp/EndpointManager.cpp | 2 +- .../network/protocols/tcp/TCPEndpoint.cpp | 28 +++++++++---------- .../kernel/network/protocols/tcp/tcp.cpp | 5 ++-- .../kernel/network/protocols/udp/udp.cpp | 2 +- src/add-ons/kernel/network/stack/datalink.cpp | 6 ++-- src/add-ons/kernel/network/stack/routes.cpp | 2 +- src/add-ons/kernel/network/stack/stack.cpp | 4 ++- 11 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp b/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp index 1954b3aa8a..f9fec41e49 100644 --- a/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp +++ b/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp @@ -32,7 +32,7 @@ #include -#define TRACE_ARP +//#define TRACE_ARP #ifdef TRACE_ARP # define TRACE(x) dprintf x #else diff --git a/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp b/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp index 67234647bb..c17bfd1e97 100644 --- a/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp +++ b/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp @@ -130,7 +130,7 @@ ethernet_send_data(net_device *_device, net_buffer *buffer) { ethernet_device *device = (ethernet_device *)_device; -dprintf("try to send ethernet packet of %lu bytes (flags %ld):\n", buffer->size, buffer->flags); +//dprintf("try to send ethernet packet of %lu bytes (flags %ld):\n", buffer->size, buffer->flags); if (buffer->size > device->frame_size || buffer->size < ETHER_HEADER_LENGTH) return B_BAD_VALUE; @@ -156,9 +156,9 @@ dprintf("try to send ethernet packet of %lu bytes (flags %ld):\n", buffer->size, struct iovec iovec; gBufferModule->get_iovecs(buffer, &iovec, 1); -dump_block((const char *)iovec.iov_base, buffer->size, " "); +//dump_block((const char *)iovec.iov_base, buffer->size, " "); ssize_t bytesWritten = write(device->fd, iovec.iov_base, iovec.iov_len); -dprintf("sent: %ld\n", bytesWritten); +//dprintf("sent: %ld\n", bytesWritten); if (bytesWritten < 0) { device->stats.send.errors++; diff --git a/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp b/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp index aa02c1c2ac..a17a677282 100644 --- a/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp +++ b/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp @@ -28,7 +28,7 @@ #include -#define TRACE_IPV4 +//#define TRACE_IPV4 #ifdef TRACE_IPV4 # define TRACE(x) dprintf x #else diff --git a/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp b/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp index 515dcaabda..f46be0d1c7 100644 --- a/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp @@ -12,7 +12,7 @@ #include -#define TRACE_BUFFER_QUEUE +//#define TRACE_BUFFER_QUEUE #ifdef TRACE_BUFFER_QUEUE # define TRACE(x) dprintf x #else diff --git a/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp b/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp index 9a61faee57..2ff5be2526 100644 --- a/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp @@ -17,7 +17,7 @@ #include -#define TRACE_ENDPOINT_MANAGER +//#define TRACE_ENDPOINT_MANAGER #ifdef TRACE_ENDPOINT_MANAGER # define TRACE(x) dprintf x #else diff --git a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp index b66f435d15..c2dc145358 100644 --- a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp @@ -41,7 +41,7 @@ // SACK, Selective Acknowledgment - RFC 2018, RFC 2883, RFC 3517 // Forward RTO-Recovery, RFC 4138 -#define TRACE_TCP +//#define TRACE_TCP #ifdef TRACE_TCP # define TRACE(x) dprintf x #else @@ -380,7 +380,7 @@ TCPEndpoint::SendData(net_buffer *buffer) * fSendMaxSegmentSize; chunk = gBufferModule->split(buffer, chunkSize); -dprintf(" TCP::Send() split buffer at %lu (buffer size %lu, mss %lu) -> %p\n", chunkSize, socket->send.buffer_size, fSendMaxSegmentSize, chunk); +TRACE((" TCP::Send() split buffer at %lu (buffer size %lu, mss %lu) -> %p\n", chunkSize, socket->send.buffer_size, fSendMaxSegmentSize, chunk)); if (chunk == NULL) return B_NO_MEMORY; } else @@ -475,7 +475,7 @@ TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer) RecursiveLocker locker(fLock); -dprintf("read %lu bytes, %lu are available\n", numBytes, fReceiveQueue.Available()); +TRACE(("read %lu bytes, %lu are available\n", numBytes, fReceiveQueue.Available())); if (numBytes < fReceiveQueue.Available()) release_sem_etc(fReceiveLock, 1, B_DO_NOT_RESCHEDULE); @@ -722,7 +722,7 @@ TCPEndpoint::Receive(tcp_segment_header &segment, net_buffer *buffer) // this is a pure acknowledge segment - we're on the sending end if (fSendUnacknowledged < segment.acknowledge && fSendMax >= segment.acknowledge) { -dprintf("header prediction send!\n"); +TRACE(("header prediction send!\n")); // and it only acknowledges outstanding data // TODO: update RTT estimators @@ -745,11 +745,11 @@ dprintf("header prediction send!\n"); } else if (segment.acknowledge == fSendUnacknowledged && fReceiveQueue.IsContiguous() && fReceiveQueue.Free() >= buffer->size) { -dprintf("header prediction receive!\n"); +TRACE(("header prediction receive!\n")); // we're on the receiving end of the connection, and this segment // is the one we were expecting, in-sequence fReceiveNext += buffer->size; -dprintf("receive next = %lu!\n", (uint32)fReceiveNext); +TRACE(("receive next = %lu!\n", (uint32)fReceiveNext)); fReceiveQueue.Add(buffer, segment.sequence); release_sem_etc(fReceiveLock, 1, B_DO_NOT_RESCHEDULE); @@ -805,7 +805,7 @@ dprintf("receive next = %lu!\n", (uint32)fReceiveNext); } // remove duplicate data at the start -dprintf("* remove %ld bytes from the start\n", drop); +TRACE(("* remove %ld bytes from the start\n", drop)); gBufferModule->remove_header(buffer, drop); segment.sequence += drop; } @@ -830,7 +830,7 @@ dprintf("* remove %ld bytes from the start\n", drop); } segment.flags &= ~(TCP_FLAG_FINISH | TCP_FLAG_PUSH); -dprintf("* remove %ld bytes from the end\n", drop); +TRACE(("* remove %ld bytes from the end\n", drop)); gBufferModule->remove_trailer(buffer, drop); } @@ -859,7 +859,7 @@ dprintf("* remove %ld bytes from the end\n", drop); // TODO: handle this! if (buffer->size == 0 && advertisedWindow == fSendWindow && (segment.flags & TCP_FLAG_FINISH) == 0) { - dprintf("duplicate ack!\n"); +TRACE(("duplicate ack!\n")); fDuplicateAcknowledgeCount++; gStackModule->cancel_timer(&fRetransmitTimer); @@ -876,10 +876,10 @@ dprintf("* remove %ld bytes from the end\n", drop); // there is no outstanding data to be acknowledged // TODO: if the transmit timer function is already waiting // to acquire this endpoint's lock, we should stop it anyway -dprintf("all inflight data ack'd!\n"); +TRACE(("all inflight data ack'd!\n")); gStackModule->cancel_timer(&fRetransmitTimer); } else { -dprintf("set retransmit timer!\n"); +TRACE(("set retransmit timer!\n")); // TODO: set retransmit timer correctly if (!gStackModule->is_timer_active(&fRetransmitTimer)) gStackModule->set_timer(&fRetransmitTimer, 1000000LL); @@ -893,7 +893,7 @@ dprintf("set retransmit timer!\n"); if (segment.acknowledge > fSendQueue.LastSequence() && fState > ESTABLISHED) { // our TCP_FLAG_FINISH has been acknowledged -dprintf("FIN has been acknowledged!\n"); +TRACE(("FIN has been acknowledged!\n")); switch (fState) { case FINISH_SENT: @@ -923,7 +923,7 @@ dprintf("FIN has been acknowledged!\n"); // TODO: ignore data *after* FIN if (segment.flags & TCP_FLAG_FINISH) { - dprintf("peer is finishing connection!"); +TRACE(("peer is finishing connection!")); fReceiveNext++; fFlags |= FLAG_NO_RECEIVE; @@ -966,7 +966,7 @@ dprintf("FIN has been acknowledged!\n"); if (buffer->size > 0) { if (fReceiveNext == segment.sequence) fReceiveNext += buffer->size; -dprintf("adding data, receive next = %lu!\n", (uint32)fReceiveNext); +TRACE(("adding data, receive next = %lu!\n", (uint32)fReceiveNext)); fReceiveQueue.Add(buffer, segment.sequence); release_sem_etc(fReceiveLock, 1, B_DO_NOT_RESCHEDULE); diff --git a/src/add-ons/kernel/network/protocols/tcp/tcp.cpp b/src/add-ons/kernel/network/protocols/tcp/tcp.cpp index 9f20139492..017d41cab3 100644 --- a/src/add-ons/kernel/network/protocols/tcp/tcp.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/tcp.cpp @@ -29,7 +29,7 @@ #include #include -#define TRACE_TCP +//#define TRACE_TCP #ifdef TRACE_TCP # define TRACE(x) dprintf x # define TRACE_BLOCK(x) dump_block x @@ -298,7 +298,7 @@ name_for_state(tcp_state state) #if 0 -void +static void dump_tcp_header(tcp_header &header) { dprintf(" source port: %u\n", ntohs(header.source_port)); @@ -528,6 +528,7 @@ tcp_receive_data(net_buffer *buffer) AddressString(gDomain, (sockaddr *)&buffer->source, true).Data(), AddressString(gDomain, (sockaddr *)&buffer->destination, true).Data())); //dump_tcp_header(header); + //gBufferModule->dump(buffer); tcp_segment_header segment; segment.sequence = header.Sequence(); diff --git a/src/add-ons/kernel/network/protocols/udp/udp.cpp b/src/add-ons/kernel/network/protocols/udp/udp.cpp index 5f52e649bb..77abd1ca75 100644 --- a/src/add-ons/kernel/network/protocols/udp/udp.cpp +++ b/src/add-ons/kernel/network/protocols/udp/udp.cpp @@ -27,7 +27,7 @@ #include -#define TRACE_UDP +//#define TRACE_UDP #ifdef TRACE_UDP # define TRACE(x) dprintf x # define TRACE_BLOCK(x) dump_block x diff --git a/src/add-ons/kernel/network/stack/datalink.cpp b/src/add-ons/kernel/network/stack/datalink.cpp index ae1b0cca4e..929b4133b0 100644 --- a/src/add-ons/kernel/network/stack/datalink.cpp +++ b/src/add-ons/kernel/network/stack/datalink.cpp @@ -49,7 +49,7 @@ device_reader_thread(void *_interface) net_buffer *buffer; status = device->module->receive_data(device, &buffer); if (status == B_OK) { - dprintf("received buffer of %ld bytes length\n", buffer->size); + //dprintf("received buffer of %ld bytes length\n", buffer->size); tries = 0; // feed device monitors @@ -354,8 +354,8 @@ datalink_send_data(struct net_route *route, net_buffer *buffer) net_interface *interface = route->interface; net_domain *domain = interface->domain; - dprintf("send buffer (%ld bytes) to interface %s (route flags %lx)\n", - buffer->size, interface->name, route->flags); + //dprintf("send buffer (%ld bytes) to interface %s (route flags %lx)\n", + // buffer->size, interface->name, route->flags); if (route->flags & RTF_REJECT) return ENETUNREACH; diff --git a/src/add-ons/kernel/network/stack/routes.cpp b/src/add-ons/kernel/network/stack/routes.cpp index 7c26cc4a3c..8c0558ecfa 100644 --- a/src/add-ons/kernel/network/stack/routes.cpp +++ b/src/add-ons/kernel/network/stack/routes.cpp @@ -27,7 +27,7 @@ #include -#define TRACE_ROUTES +//#define TRACE_ROUTES #ifdef TRACE_ROUTES # define TRACE(x) dprintf x #else diff --git a/src/add-ons/kernel/network/stack/stack.cpp b/src/add-ons/kernel/network/stack/stack.cpp index 5e4e2e51fc..1ee6f07350 100644 --- a/src/add-ons/kernel/network/stack/stack.cpp +++ b/src/add-ons/kernel/network/stack/stack.cpp @@ -31,7 +31,7 @@ #include -#define TRACE_STACK +//#define TRACE_STACK #ifdef TRACE_STACK # define TRACE(x) dprintf x #else @@ -314,9 +314,11 @@ chain::Hash(void *_chain, const void *_key, uint32 range) // TODO: check if this makes a good hash... #define HASH(o) ((uint32)(((o)->family) ^ ((o)->type) ^ ((o)->protocol)) % range) +#if 0 TRACE(("%d.%d.%d: Hash: %lu\n", chain ? chain->family : key->family, chain ? chain->type : key->type, chain ? chain->protocol : key->protocol, chain ? HASH(chain) : HASH(key))); +#endif if (chain != NULL) return HASH(chain);