Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'feature/tw11250_add_tcp_delay_statistics' into 'master'

Browse source 
lwip: refactor to esp specific counter

1. Add tcp debug counter
2. Refactor other ESP specific counter

See merge request !635
This commit is contained in:
Ivan Grokhotkov 2017-04-13 15:29:36 +08:00
commit 378884660a
15 changed files with 263 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/lwip/api/api_msg.c
View file

@ -128,7 +128,7 @@ recv_raw(void *arg, struct raw_pcb *pcb, struct pbuf *p,
len = q->tot_len;
if (sys_mbox_trypost(&conn->recvmbox, buf) != ERR_OK) {
ESP_STATS_INC(esp.rx_rawmbox_post_fail);
ESP_STATS_DROP_INC(esp.rx_rawmbox_post_fail);
netbuf_delete(buf);
return 0;
} else {
@ -210,7 +210,7 @@ recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
len = p->tot_len;
if (sys_mbox_trypost(&conn->recvmbox, buf) != ERR_OK) {
ESP_STATS_INC(esp.rx_udpmbox_post_fail);
ESP_STATS_DROP_INC(esp.rx_udpmbox_post_fail);
netbuf_delete(buf);
return;
} else {
@ -270,7 +270,7 @@ recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
}
if (sys_mbox_trypost(&conn->recvmbox, p) != ERR_OK) {
ESP_STATS_INC(esp.rx_tcpmbox_post_fail);
ESP_STATS_DROP_INC(esp.rx_tcpmbox_post_fail);
/* don't deallocate p: it is presented to us later again from tcp_fasttmr! */
return ERR_MEM;
} else {
@ -401,14 +401,14 @@ err_tcp(void *arg, err_t err)
if (sys_mbox_valid(&conn->recvmbox)) {
/* use trypost to prevent deadlock */
if (sys_mbox_trypost(&conn->recvmbox, NULL) != ERR_OK){
ESP_STATS_INC(esp.err_tcp_rxmbox_post_fail);
ESP_STATS_DROP_INC(esp.err_tcp_rxmbox_post_fail);
}
}
/* pass NULL-message to acceptmbox to wake up pending accept */
if (sys_mbox_valid(&conn->acceptmbox)) {
/* use trypost to preven deadlock */
if (sys_mbox_trypost(&conn->acceptmbox, NULL) != ERR_OK) {
ESP_STATS_INC(esp.err_tcp_rxmbox_post_fail);
ESP_STATS_DROP_INC(esp.err_tcp_rxmbox_post_fail);
}
}
@ -489,7 +489,7 @@ accept_function(void *arg, struct tcp_pcb *newpcb, err_t err)
newconn->last_err = err;
if (sys_mbox_trypost(&conn->acceptmbox, newconn) != ERR_OK) {
ESP_STATS_INC(esp.acceptmbox_post_fail);
ESP_STATS_DROP_INC(esp.acceptmbox_post_fail);
/* When returning != ERR_OK, the pcb is aborted in tcp_process(),
so do nothing here! */
/* remove all references to this netconn from the pcb */

171
components/lwip/api/lwip_debug.c
View file

@ -1,171 +0,0 @@
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "lwip/lwip_debug.h"
#include "lwip/api.h"
#include "lwip/netbuf.h"
#include "lwip/tcp.h"
#include "lwip/udp.h"
#include "lwip/priv/tcp_priv.h"
#include "lwip/stats.h"
#include "lwip/priv/memp_priv.h"
#include "lwip/memp.h"
#define DBG_LWIP_IP_SHOW(info, ip) printf("%s type=%d ip=%x\n", (info), (ip).type, (ip).u_addr.ip4.addr)
#define DBG_LWIP_IP_PCB_SHOW(pcb) \
DBG_LWIP_IP_SHOW("local ip", (pcb)->local_ip);\
DBG_LWIP_IP_SHOW("remote ip", (pcb)->local_ip);\
printf("so_options=%x, tos=%d ttl=%d\n", (pcb)->so_options, (pcb)->tos, (pcb)->ttl)
#define DBG_LWIP_SEG_SHOW(seg) while(seg) { printf("\tseg=%p next=%p pbuf=%p flags=%x\n", (seg), (seg)->next, (seg)->p, (seg)->flags); (seg)=(seg)->next;}
static void dbg_lwip_tcp_pcb_one_show(struct tcp_pcb* pcb)
{
struct tcp_seg *seg = NULL;
if (!pcb) {
return;
}
printf("\npcb=%p next=%p cb_arg=%p\n", pcb, pcb->next, pcb->callback_arg);
DBG_LWIP_IP_PCB_SHOW(pcb);
printf("state=%x\n", pcb->state);
printf("prio=%d\n", pcb->prio);
printf("local_port=%d, remote_port=%d\n", pcb->local_port, pcb->remote_port);
printf("flags=%x\n", pcb->flags);
printf("pooltmr=%d pollinterval=%d, last_tmr=%d tmr=%d rtmer=%d\n", pcb->polltmr, pcb->pollinterval, pcb->last_timer, pcb->tmr, pcb->rtime);
printf("recv_nxt=%d recv_wnd=%d recv_ann_wnd=%d recv_ann_right_edge=%d\n", pcb->rcv_nxt, pcb->rcv_wnd, pcb->rcv_ann_wnd, pcb->rcv_ann_right_edge);
printf("mss=%d\n", pcb->mss);
printf("rttest=%d rtseq=%d sa=%d sv=%d\n", pcb->rttest, pcb->rtseq, pcb->sa, pcb->sv);
printf("rto=%d nrtx=%d\n", pcb->rto, pcb->nrtx);
printf("dupacks=%d lastack=%d\n", pcb->dupacks, pcb->lastack);
#if ESP_PER_SOC_TCP_WND
printf("per_soc_window=%d per_soc_snd_buf=%d\n", pcb->per_soc_tcp_wnd, pcb->per_soc_tcp_snd_buf);
#endif
printf("cwnd=%d ssthreash=%d\n", pcb->cwnd, pcb->ssthresh);
printf("snd_next=%d snd_wl1=%d snd_wl2=%d\n", pcb->snd_nxt, pcb->snd_wl1, pcb->snd_wl2);
printf("snd_lbb=%d snd_wnd=%d snd_wnd_max=%d\n", pcb->snd_lbb, pcb->snd_wnd, pcb->snd_wnd_max);
printf("acked=%d\n", pcb->acked);
printf("snd_buf=%d snd_queuelen=%d\n", pcb->snd_buf, pcb->snd_queuelen);
printf("unsent_oversize=%d\n", pcb->unsent_oversize);
printf("keep_idle=%d keep_intvl=%d keep_cnt=%d\n", pcb->keep_idle, pcb->keep_intvl, pcb->keep_cnt);
printf("persist_cnt=%d persist_backoff=%d\n", pcb->persist_cnt, pcb->persist_backoff);
printf("keep_cnt_sent=%d\n", pcb->keep_cnt_sent);
printf("unsent segments:\n");
seg = pcb->unsent;
DBG_LWIP_SEG_SHOW(seg)
printf("unacked segments:\n");
seg = pcb->unacked;
DBG_LWIP_SEG_SHOW(seg);
printf("ooseg semengts:\n");
seg = pcb->ooseq;
DBG_LWIP_SEG_SHOW(seg);
printf("refused data=%p\n", pcb->refused_data);
}
static void dbg_lwip_tcp_pcb_list_show(struct tcp_pcb* pcb)
{
while(pcb){
dbg_lwip_tcp_pcb_one_show(pcb);
pcb = pcb->next;
}
}
extern struct tcp_pcb *tcp_bound_pcbs;
extern struct tcp_pcb *tcp_active_pcbs;
extern struct tcp_pcb *tcp_tw_pcbs;
void dbg_lwip_tcp_pcb_show(void)
{
printf("-------------active pcbs------------\n");
dbg_lwip_tcp_pcb_list_show(tcp_active_pcbs);
printf("-------------bound pcbs-------------\n");
dbg_lwip_tcp_pcb_list_show(tcp_bound_pcbs);
printf("-------------tw pcbs------------\n");
dbg_lwip_tcp_pcb_list_show(tcp_tw_pcbs);
}
void dbg_lwip_udp_pcb_one_show(struct udp_pcb *pcb)
{
printf("pcb=%p next=%p\n", pcb, (void*)pcb->next);
DBG_LWIP_IP_PCB_SHOW(pcb);
printf("flags=%x\n", pcb->flags);
printf("local_port=%d remote_port=%d\n", pcb->local_port, pcb->remote_port);
printf("recv cb=%p recv_arg=%p\n", pcb->recv, pcb->recv_arg);
}
extern struct udp_pcb *udp_pcbs;
void dbg_lwip_udp_pcb_show(void)
{
struct udp_pcb *pcb = udp_pcbs;
while (pcb){
dbg_lwip_udp_pcb_one_show(pcb);
pcb = pcb->next;
}
}
void dbg_lwip_tcp_rxtx_show(void)
{
printf("TBC\n");
}
void dbg_lwip_udp_rxtx_show(void)
{
printf("TBC\n");
}
void dbg_lwip_stats_show(void)
{
TCP_STATS_DISPLAY();
UDP_STATS_DISPLAY();
ICMP_STATS_DISPLAY();
IGMP_STATS_DISPLAY();
IP_STATS_DISPLAY();
IPFRAG_STATS_DISPLAY();
ETHARP_STATS_DISPLAY();
LINK_STATS_DISPLAY();
MEM_STATS_DISPLAY();
SYS_STATS_DISPLAY();
IP6_STATS_DISPLAY();
ICMP6_STATS_DISPLAY();
IP6_FRAG_STATS_DISPLAY();
MLD6_STATS_DISPLAY();
ND6_STATS_DISPLAY();
ESP_STATS_DISPLAY();
}
#if (ESP_CNT_DEBUG == 1)
uint32_t g_lwip_mem_cnt[MEMP_MAX][2];
extern const struct memp_desc * const memp_pools[MEMP_MAX];
void dbg_lwip_cnt_show(void)
{
int i=0;
printf("-----lwip memory counter-----\n");
printf("%6s %8s %8s\n", "index", "alloc", "free");
for (i=0; i<MEMP_MAX; i++){
printf("%6u %8u %8u\n", i, g_lwip_mem_cnt[i][0], g_lwip_mem_cnt[i][1]);
}
}
#endif

4
components/lwip/api/tcpip.c
View file

@ -227,7 +227,7 @@ tcpip_inpkt(struct pbuf *p, struct netif *inp, netif_input_fn input_fn)
#endif
if (sys_mbox_trypost(&mbox, msg) != ERR_OK) {
ESP_STATS_INC(esp.tcpip_inpkt_post_fail);
ESP_STATS_DROP_INC(esp.tcpip_inpkt_post_fail);
memp_free(MEMP_TCPIP_MSG_INPKT, msg);
return ERR_MEM;
}
@ -284,7 +284,7 @@ tcpip_callback_with_block(tcpip_callback_fn function, void *ctx, u8_t block)
sys_mbox_post(&mbox, msg);
} else {
if (sys_mbox_trypost(&mbox, msg) != ERR_OK) {
ESP_STATS_INC(esp.tcpip_cb_post_fail);
ESP_STATS_DROP_INC(esp.tcpip_cb_post_fail);
memp_free(MEMP_TCPIP_MSG_API, msg);
return ERR_MEM;
}

2
components/lwip/component.mk
View file

@ -4,7 +4,7 @@
COMPONENT_ADD_INCLUDEDIRS := include/lwip include/lwip/port include/lwip/posix apps/ping
COMPONENT_SRCDIRS := api apps/sntp apps/ping apps core/ipv4 core/ipv6 core netif port/freertos port/netif port
COMPONENT_SRCDIRS := api apps/sntp apps/ping apps core/ipv4 core/ipv6 core netif port/freertos port/netif port/debug port
CFLAGS += -Wno-address # lots of LWIP source files evaluate macros that check address of stack variables

2
components/lwip/core/stats.c
View file

@ -180,7 +180,7 @@ stats_display(void)
}
#endif /* LWIP_STATS_DISPLAY */
#if ESP_STATS
#if ESP_STATS_DROP
void stats_display_esp(struct stats_esp *esp)
{
LWIP_PLATFORM_DIAG(("\nESP\n\t"));

2
components/lwip/core/tcp.c
View file

@ -906,6 +906,8 @@ tcp_slowtmr_start:
" pcb->rto %"S16_F"\n",
pcb->rtime, pcb->rto));
ESP_STATS_TCP_PCB(pcb);
/* Double retransmission time-out unless we are trying to
* connect to somebody (i.e., we are in SYN_SENT). */
if (pcb->state != SYN_SENT) {

2
components/lwip/core/tcp_out.c
View file

@ -213,6 +213,7 @@ tcp_create_segment(struct tcp_pcb *pcb, struct pbuf *p, u8_t flags, u32_t seqno,
TCPH_HDRLEN_FLAGS_SET(seg->tcphdr, (5 + optlen / 4), flags);
/* wnd and chksum are set in tcp_output */
seg->tcphdr->urgp = 0;
return seg;
}
@ -1424,6 +1425,7 @@ tcp_rexmit(struct tcp_pcb *pcb)
}
#endif /* TCP_OVERSIZE */
ESP_STATS_TCP_PCB(pcb);
++pcb->nrtx;
/* Don't take any rtt measurements after retransmitting. */

2
components/lwip/include/lwip/lwip/memp.h
View file

@ -71,7 +71,7 @@ extern const struct memp_desc* const memp_pools[MEMP_MAX];
#include "lwip/mem.h"
#define memp_init()
#if ESP_CNT_DEBUG
#if ESP_STATS_MEM
static inline void* memp_malloc(int type)
{
ESP_CNT_MEM_MALLOC_INC(type);

2
components/lwip/include/lwip/lwip/priv/memp_priv.h
View file

@ -140,7 +140,7 @@ struct memp_desc {
#endif /* MEMP_MEM_MALLOC */
};
#if (ESP_CNT_DEBUG == 1)
#if (ESP_STATS_MEM == 1)
extern uint32_t g_lwip_mem_cnt[MEMP_MAX][2];
#define ESP_CNT_MEM_MALLOC_INC(type) g_lwip_mem_cnt[type][0]++
#define ESP_CNT_MEM_FREE_INC(type) g_lwip_mem_cnt[type][1]++

12
components/lwip/include/lwip/lwip/stats.h
View file

@ -282,7 +282,7 @@ struct stats_ {
#if MIB2_STATS
struct stats_mib2 mib2;
#endif
#if ESP_STATS
#if ESP_STATS_DROP
struct stats_esp esp;
#endif
};
@ -458,12 +458,12 @@ void stats_init(void);
#define MIB2_STATS_INC(x)
#endif
#if ESP_STATS
#define ESP_STATS_INC(x) STATS_INC(x)
#define ESP_STATS_DISPLAY() stats_display_esp(&lwip_stats.esp);
#if ESP_STATS_DROP
#define ESP_STATS_DROP_INC(x) STATS_INC(x)
#define ESP_STATS_DROP_DISPLAY() stats_display_esp(&lwip_stats.esp);
#else
#define ESP_STATS_INC(x)
#define ESP_STATS_DISPLAY()
#define ESP_STATS_DROP_INC(x)
#define ESP_STATS_DROP_DISPLAY()
#endif
/* Display of statistics */

21
components/lwip/include/lwip/lwip/tcp.h
View file

@ -310,8 +310,29 @@ struct tcp_pcb {
u8_t snd_scale;
u8_t rcv_scale;
#endif
#if ESP_STATS_TCP
#define ESP_STATS_TCP_ARRAY_SIZE 20
u16_t retry_cnt[TCP_MAXRTX];
u16_t rto_cnt[ESP_STATS_TCP_ARRAY_SIZE];
#endif
};
#if ESP_STATS_TCP
#define ESP_STATS_TCP_PCB(_pcb) do {\
if ((_pcb)->unacked) {\
(_pcb)->retry_cnt[(_pcb)->nrtx]++;\
if ((_pcb)->rto < ESP_STATS_TCP_ARRAY_SIZE) {\
(_pcb)->rto_cnt[(_pcb)->rto]++;\
} else {\
(_pcb)->rto_cnt[ESP_STATS_TCP_ARRAY_SIZE-1] ++;\
}\
}\
} while(0)
#else
#define ESP_STATS_TCP_PCB(pcb)
#endif
struct tcp_pcb_listen {
/* Common members of all PCB types */
IP_PCB;

6
components/lwip/include/lwip/port/lwipopts.h
View file

@ -601,8 +601,11 @@
#define ESP_IP4_ATON 1
#define ESP_LIGHT_SLEEP 1
#define ESP_L2_TO_L3_COPY CONFIG_L2_TO_L3_COPY
#define ESP_CNT_DEBUG 0
#define ESP_STATS_MEM 0
#define ESP_STATS_DROP 0
#define ESP_STATS_TCP 0
#define ESP_DHCP_TIMER 1
#define ESP_LWIP_LOGI(...) ESP_LOGI("lwip", __VA_ARGS__)
#define TCP_WND_DEFAULT (4*TCP_MSS)
#define TCP_SND_BUF_DEFAULT (2*TCP_MSS)
@ -642,7 +645,6 @@ enum {
#define DHCP_DEBUG LWIP_DBG_OFF
#define LWIP_DEBUG LWIP_DBG_OFF
#define TCP_DEBUG LWIP_DBG_OFF
#define ESP_STATS 0
#define CHECKSUM_CHECK_UDP 0
#define CHECKSUM_CHECK_IP 0

213
components/lwip/port/debug/lwip_debug.c Normal file
View file

@ -0,0 +1,213 @@
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "lwip/lwip_debug.h"
#include "lwip/api.h"
#include "lwip/netbuf.h"
#include "lwip/tcp.h"
#include "lwip/udp.h"
#include "lwip/priv/tcp_priv.h"
#include "lwip/stats.h"
#include "lwip/priv/memp_priv.h"
#include "lwip/memp.h"
#include "esp_log.h"
#define DBG_LWIP_IP_SHOW(info, ip) ESP_LWIP_LOGI("%s type=%d ip=%x", (info), (ip).type, (ip).u_addr.ip4.addr)
#define DBG_LWIP_IP_PCB_SHOW(pcb) \
DBG_LWIP_IP_SHOW("local ip", (pcb)->local_ip);\
DBG_LWIP_IP_SHOW("remote ip", (pcb)->local_ip);\
ESP_LWIP_LOGI("so_options=%x, tos=%d ttl=%d", (pcb)->so_options, (pcb)->tos, (pcb)->ttl)
#define DBG_LWIP_SEG_SHOW(seg) while(seg) { ESP_LWIP_LOGI("\tseg=%p next=%p pbuf=%p flags=%x", (seg), (seg)->next, (seg)->p, (seg)->flags); (seg)=(seg)->next;}
#define DBG_LWIP_ITEM_NUMBER_PER_LINE 9
#if ESP_STATS_TCP
static void dbg_lwip_tcp_pcb_cnt_show(struct tcp_pcb *pcb)
{
int len = 0;
char *buf;
char *p;
int i;
buf = malloc(512);
if (!buf) {
return;
}
p = buf;
len += sprintf(p + len, "%11s", "tcp_retry: ");
for (i=0; i<TCP_MAXRTX; i++) {
len += sprintf(p + len, "%-2d=%-5d ", i+1, pcb->retry_cnt[i]);
}
ESP_LWIP_LOGI("%s", buf);
p = buf;
len = 0;
len += sprintf(p + len, "%11s", "tcp_rto#0:");
for (i=0; i<ESP_STATS_TCP_ARRAY_SIZE; i++) {
if ((i!=0) && (i%DBG_LWIP_ITEM_NUMBER_PER_LINE==0)) {
ESP_LWIP_LOGI("%s", buf);
len = 0;
p = buf;
len += sprintf(p + len, "%11s", "tcp_rto#1:");
}
len += sprintf(p + len, "%-2d=%-5d ", i+1, pcb->rto_cnt[i]);
}
ESP_LWIP_LOGI("%s", buf);
free(buf);
}
#endif
static void dbg_lwip_tcp_pcb_one_show(struct tcp_pcb* pcb)
{
struct tcp_seg *seg = NULL;
if (!pcb) {
return;
}
ESP_LWIP_LOGI("pcb=%p next=%p cb_arg=%p", pcb, pcb->next, pcb->callback_arg);
DBG_LWIP_IP_PCB_SHOW(pcb);
ESP_LWIP_LOGI("state=%x", pcb->state);
ESP_LWIP_LOGI("prio=%d", pcb->prio);
ESP_LWIP_LOGI("local_port=%d, remote_port=%d", pcb->local_port, pcb->remote_port);
ESP_LWIP_LOGI("flags=%x", pcb->flags);
ESP_LWIP_LOGI("pooltmr=%d pollinterval=%d, last_tmr=%d tmr=%d rtmer=%d", pcb->polltmr, pcb->pollinterval, pcb->last_timer, pcb->tmr, pcb->rtime);
ESP_LWIP_LOGI("recv_nxt=%d recv_wnd=%d recv_ann_wnd=%d recv_ann_right_edge=%d", pcb->rcv_nxt, pcb->rcv_wnd, pcb->rcv_ann_wnd, pcb->rcv_ann_right_edge);
ESP_LWIP_LOGI("mss=%d", pcb->mss);
ESP_LWIP_LOGI("rttest=%d rtseq=%d sa=%d sv=%d", pcb->rttest, pcb->rtseq, pcb->sa, pcb->sv);
ESP_LWIP_LOGI("rto=%d nrtx=%d", pcb->rto, pcb->nrtx);
ESP_LWIP_LOGI("dupacks=%d lastack=%d", pcb->dupacks, pcb->lastack);
#if ESP_PER_SOC_TCP_WND
ESP_LWIP_LOGI("per_soc_window=%d per_soc_snd_buf=%d", pcb->per_soc_tcp_wnd, pcb->per_soc_tcp_snd_buf);
#endif
ESP_LWIP_LOGI("cwnd=%d ssthreash=%d", pcb->cwnd, pcb->ssthresh);
ESP_LWIP_LOGI("snd_next=%d snd_wl1=%d snd_wl2=%d", pcb->snd_nxt, pcb->snd_wl1, pcb->snd_wl2);
ESP_LWIP_LOGI("snd_lbb=%d snd_wnd=%d snd_wnd_max=%d", pcb->snd_lbb, pcb->snd_wnd, pcb->snd_wnd_max);
ESP_LWIP_LOGI("acked=%d", pcb->acked);
ESP_LWIP_LOGI("snd_buf=%d snd_queuelen=%d", pcb->snd_buf, pcb->snd_queuelen);
ESP_LWIP_LOGI("unsent_oversize=%d", pcb->unsent_oversize);
ESP_LWIP_LOGI("keep_idle=%d keep_intvl=%d keep_cnt=%d", pcb->keep_idle, pcb->keep_intvl, pcb->keep_cnt);
ESP_LWIP_LOGI("persist_cnt=%d persist_backoff=%d", pcb->persist_cnt, pcb->persist_backoff);
ESP_LWIP_LOGI("keep_cnt_sent=%d", pcb->keep_cnt_sent);
ESP_LWIP_LOGI("unsent segments:");
seg = pcb->unsent;
DBG_LWIP_SEG_SHOW(seg)
ESP_LWIP_LOGI("unacked segments:");
seg = pcb->unacked;
DBG_LWIP_SEG_SHOW(seg);
ESP_LWIP_LOGI("ooseg semengts:");
seg = pcb->ooseq;
DBG_LWIP_SEG_SHOW(seg);
ESP_LWIP_LOGI("refused data=%p", pcb->refused_data);
#if ESP_STATS_TCP
dbg_lwip_tcp_pcb_cnt_show(pcb);
#endif
}
static void dbg_lwip_tcp_pcb_list_show(struct tcp_pcb* pcb)
{
while(pcb){
dbg_lwip_tcp_pcb_one_show(pcb);
pcb = pcb->next;
}
}
extern struct tcp_pcb *tcp_bound_pcbs;
extern struct tcp_pcb *tcp_active_pcbs;
extern struct tcp_pcb *tcp_tw_pcbs;
void dbg_lwip_tcp_pcb_show(void)
{
ESP_LWIP_LOGI("-------------active pcbs------------");
dbg_lwip_tcp_pcb_list_show(tcp_active_pcbs);
ESP_LWIP_LOGI("-------------bound pcbs-------------");
dbg_lwip_tcp_pcb_list_show(tcp_bound_pcbs);
ESP_LWIP_LOGI("-------------tw pcbs------------");
dbg_lwip_tcp_pcb_list_show(tcp_tw_pcbs);
}
void dbg_lwip_udp_pcb_one_show(struct udp_pcb *pcb)
{
ESP_LWIP_LOGI("pcb=%p next=%p", pcb, (void*)pcb->next);
DBG_LWIP_IP_PCB_SHOW(pcb);
ESP_LWIP_LOGI("flags=%x", pcb->flags);
ESP_LWIP_LOGI("local_port=%d remote_port=%d", pcb->local_port, pcb->remote_port);
ESP_LWIP_LOGI("recv cb=%p recv_arg=%p", pcb->recv, pcb->recv_arg);
}
extern struct udp_pcb *udp_pcbs;
void dbg_lwip_udp_pcb_show(void)
{
struct udp_pcb *pcb = udp_pcbs;
while (pcb){
dbg_lwip_udp_pcb_one_show(pcb);
pcb = pcb->next;
}
}
void dbg_lwip_tcp_rxtx_show(void)
{
ESP_LWIP_LOGI("TBC");
}
void dbg_lwip_udp_rxtx_show(void)
{
ESP_LWIP_LOGI("TBC");
}
void dbg_lwip_stats_show(void)
{
TCP_STATS_DISPLAY();
UDP_STATS_DISPLAY();
ICMP_STATS_DISPLAY();
IGMP_STATS_DISPLAY();
IP_STATS_DISPLAY();
IPFRAG_STATS_DISPLAY();
ETHARP_STATS_DISPLAY();
LINK_STATS_DISPLAY();
MEM_STATS_DISPLAY();
SYS_STATS_DISPLAY();
IP6_STATS_DISPLAY();
ICMP6_STATS_DISPLAY();
IP6_FRAG_STATS_DISPLAY();
MLD6_STATS_DISPLAY();
ND6_STATS_DISPLAY();
ESP_STATS_DROP_DISPLAY();
}
#if (ESP_STATS_MEM == 1)
uint32_t g_lwip_mem_cnt[MEMP_MAX][2];
extern const struct memp_desc * const memp_pools[MEMP_MAX];
void dbg_lwip_cnt_show(void)
{
int i=0;
ESP_LWIP_LOGI("-----lwip memory counter-----");
ESP_LWIP_LOGI("%6s %8s %8s", "index", "alloc", "free");
for (i=0; i<MEMP_MAX; i++){
ESP_LWIP_LOGI("%6u %8u %8u", i, g_lwip_mem_cnt[i][0], g_lwip_mem_cnt[i][1]);
}
}
#endif

2
components/lwip/port/freertos/sys_arch.c
View file

@ -375,7 +375,7 @@ sys_mbox_free(sys_mbox_t *mbox)
if (post_null){
LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sys_mbox_free: post null to mbox\n"));
if (sys_mbox_trypost( mbox, NULL) != ERR_OK){
ESP_STATS_INC(esp.free_mbox_post_fail);
ESP_STATS_DROP_INC(esp.free_mbox_post_fail);
LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sys_mbox_free: post null mbox fail\n"));
} else {
post_null = false;

4
components/lwip/port/netif/wlanif.c
View file

@ -150,7 +150,7 @@ wlanif_input(struct netif *netif, void *buffer, u16_t len, void* eb)
#if (ESP_L2_TO_L3_COPY == 1)
p = pbuf_alloc(PBUF_RAW, len, PBUF_RAM);
if (p == NULL) {
ESP_STATS_INC(esp.wlanif_input_pbuf_fail);
ESP_STATS_DROP_INC(esp.wlanif_input_pbuf_fail);
esp_wifi_internal_free_rx_buffer(eb);
return;
}
@ -160,7 +160,7 @@ wlanif_input(struct netif *netif, void *buffer, u16_t len, void* eb)
#else
p = pbuf_alloc(PBUF_RAW, len, PBUF_REF);
if (p == NULL){
ESP_STATS_INC(esp.wlanif_input_pbuf_fail);
ESP_STATS_DROP_INC(esp.wlanif_input_pbuf_fail);
return;
}
p->payload = buffer;