From 131eed412ad6d38fbe7b2f2ed3ecdc9514fa68ca Mon Sep 17 00:00:00 2001 From: jani Date: Thu, 14 Nov 2002 12:20:37 +0000 Subject: [PATCH] Fix function names in DEBUGF stataments.Remove reference to "reclaimed" field in stat. --- src/core/mem.c | 2 +- src/core/memp.c | 2 +- src/core/tcp.c | 8 ++++---- src/core/tcp_in.c | 2 +- src/core/tcp_out.c | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/mem.c b/src/core/mem.c index 1e694eb1..d8668bba 100644 --- a/src/core/mem.c +++ b/src/core/mem.c @@ -266,7 +266,7 @@ mem_realloc(void *rmem, mem_size_t newsize) (u8_t *)rmem < (u8_t *)ram_end); if((u8_t *)rmem < (u8_t *)ram || (u8_t *)rmem >= (u8_t *)ram_end) { - DEBUGF(MEM_DEBUG, ("mem_free: illegal memory\n")); + DEBUGF(MEM_DEBUG, ("mem_realloc: illegal memory\n")); return rmem; } mem = (struct mem *)((u8_t *)rmem - SIZEOF_STRUCT_MEM); diff --git a/src/core/memp.c b/src/core/memp.c index 50c9772c..c0792b34 100644 --- a/src/core/memp.c +++ b/src/core/memp.c @@ -144,7 +144,7 @@ memp_init(void) #ifdef MEMP_STATS for(i = 0; i < MEMP_MAX; ++i) { stats.memp[i].used = stats.memp[i].max = - stats.memp[i].err = stats.memp[i].reclaimed = 0; + stats.memp[i].err = 0; stats.memp[i].avail = memp_num[i]; } #endif /* MEMP_STATS */ diff --git a/src/core/tcp.c b/src/core/tcp.c index ef8fc2be..a802d21f 100644 --- a/src/core/tcp.c +++ b/src/core/tcp.c @@ -620,7 +620,7 @@ tcp_fasttmr(void) /* send delayed ACKs */ for(pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { if(pcb->flags & TF_ACK_DELAY) { - DEBUGF(TCP_DEBUG, ("tcp_timer_fine: delayed ACK\n")); + DEBUGF(TCP_DEBUG, ("tcp_fasttmr: delayed ACK\n")); tcp_ack_now(pcb); pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW); } @@ -747,7 +747,7 @@ tcp_kill_prio(u8_t prio) } } if(inactive != NULL) { - DEBUGF(TCP_DEBUG, ("tcp_mem_reclaim: killing oldest PCB 0x%p (%ld)\n", + DEBUGF(TCP_DEBUG, ("tcp_kill_prio: killing oldest PCB 0x%p (%ld)\n", inactive, inactivity)); tcp_abort(inactive); } @@ -769,7 +769,7 @@ tcp_kill_timewait(void) } } if(inactive != NULL) { - DEBUGF(TCP_DEBUG, ("tcp_mem_reclaim: killing oldest TIME-WAIT PCB 0x%p (%ld)\n", + DEBUGF(TCP_DEBUG, ("tcp_kill_timewait: killing oldest TIME-WAIT PCB 0x%p (%ld)\n", inactive, inactivity)); tcp_abort(inactive); } @@ -786,7 +786,7 @@ tcp_alloc(u8_t prio) pcb = memp_malloc(MEMP_TCP_PCB); if(pcb == NULL) { /* Try killing oldest connection in TIME-WAIT. */ - DEBUGF(TCP_DEBUG, ("tcp_new: killing off oldest TIME-WAIT connection\n")); + DEBUGF(TCP_DEBUG, ("tcp_alloc: killing off oldest TIME-WAIT connection\n")); tcp_kill_timewait(); pcb = memp_malloc(MEMP_TCP_PCB); if(pcb == NULL) { diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c index 9b691e14..04d9b5e5 100644 --- a/src/core/tcp_in.c +++ b/src/core/tcp_in.c @@ -345,7 +345,7 @@ tcp_listen_input(struct tcp_pcb_listen *pcb) if(flags & TCP_ACK) { /* For incoming segments with the ACK flag set, respond with a RST. */ - DEBUGF(TCP_RST_DEBUG, ("tcp_process: ACK in LISTEN, sending reset\n")); + DEBUGF(TCP_RST_DEBUG, ("tcp_listen_input: ACK in LISTEN, sending reset\n")); tcp_rst(ackno + 1, seqno + tcplen, &(iphdr->dest), &(iphdr->src), tcphdr->dest, tcphdr->src); diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c index afabd149..f6340966 100644 --- a/src/core/tcp_out.c +++ b/src/core/tcp_out.c @@ -255,7 +255,7 @@ tcp_enqueue(struct tcp_pcb *pcb, void *arg, u16_t len, useg->len += queue->len; useg->next = queue->next; - DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: chaining, new len %u\n", useg->len)); + DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_enqueue: chaining, new len %u\n", useg->len)); if(seg == queue) { seg = NULL; } @@ -346,12 +346,12 @@ tcp_output(struct tcp_pcb *pcb) pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW); p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_RAM); if(p == NULL) { - DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_enqueue: (ACK) could not allocate pbuf\n")); + DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: (ACK) could not allocate pbuf\n")); return ERR_BUF; } - DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_enqueue: sending ACK for %lu\n", pcb->rcv_nxt)); + DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: sending ACK for %lu\n", pcb->rcv_nxt)); if(pbuf_header(p, TCP_HLEN)) { - DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_enqueue: (ACK) no room for TCP header in pbuf.\n")); + DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: (ACK) no room for TCP header in pbuf.\n")); #ifdef TCP_STATS ++stats.tcp.err; @@ -517,7 +517,7 @@ tcp_rst(u32_t seqno, u32_t ackno, } } if(pbuf_header(p, TCP_HLEN)) { - DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_send_data: no room for TCP header in pbuf.\n")); + DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_rst: no room for TCP header in pbuf.\n")); #ifdef TCP_STATS ++stats.tcp.err;