mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-08-24 23:25:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lowpan6: Rework to speed up dequeue datagram process

Browse Source 
Current implementation iterates the lowpan6_data.reass_list every time
dequeue_datagram() is called.
We can get previous lrh in all the context calling dequeue_datagram().
By adding a prev arguemnt to dequeue_datagram(), we can speed up the
dequeue datagram process.

All the callers never check return value of dequeue_datagram() as it
always return ERR_OR, thus make it return void instead.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Simon Goldschmidt <goldsimon@gmx.de>
This commit is contained in:
Axel Lin 2018-03-13 08:16:35 +08:00
parent 909037c2ca
commit 10ae311a93
1 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/netif/lowpan6.c
View File

@ -110,7 +110,7 @@ static const struct ieee_802154_addr ieee_802154_broadcast = {2, {0xff, 0xff}};
static struct ieee_802154_addr short_mac_addr = {2, {0, 0}}; static struct ieee_802154_addr short_mac_addr = {2, {0, 0}};
#endif /* LWIP_6LOWPAN_INFER_SHORT_ADDRESS */ #endif /* LWIP_6LOWPAN_INFER_SHORT_ADDRESS */
static err_t dequeue_datagram(struct lowpan6_reass_helper *lrh); static void dequeue_datagram(struct lowpan6_reass_helper *lrh, struct lowpan6_reass_helper *prev);
static void static void
free_reass_datagram(struct lowpan6_reass_helper *lrh) free_reass_datagram(struct lowpan6_reass_helper *lrh)
@ -132,41 +132,34 @@ free_reass_datagram(struct lowpan6_reass_helper *lrh)
void void
lowpan6_tmr(void) lowpan6_tmr(void)
{ {
struct lowpan6_reass_helper *lrh, *lrh_temp; struct lowpan6_reass_helper *lrh, *lrh_next, *lrh_prev = NULL;
lrh = lowpan6_data.reass_list; lrh = lowpan6_data.reass_list;
while (lrh != NULL) { while (lrh != NULL) {
lrh_temp = lrh->next_packet; lrh_next = lrh->next_packet;
if ((--lrh->timer) == 0) { if ((--lrh->timer) == 0) {
dequeue_datagram(lrh); dequeue_datagram(lrh, lrh_prev);
free_reass_datagram(lrh); free_reass_datagram(lrh);
} else {
lrh_prev = lrh;
} }
lrh = lrh_temp; lrh = lrh_next;
} }
} }
/** /**
* Removes a datagram from the reassembly queue. * Removes a datagram from the reassembly queue.
**/ **/
static err_t static void
dequeue_datagram(struct lowpan6_reass_helper *lrh) dequeue_datagram(struct lowpan6_reass_helper *lrh, struct lowpan6_reass_helper *prev)
{ {
struct lowpan6_reass_helper *lrh_temp;
if (lowpan6_data.reass_list == lrh) { if (lowpan6_data.reass_list == lrh) {
lowpan6_data.reass_list = lowpan6_data.reass_list->next_packet; lowpan6_data.reass_list = lowpan6_data.reass_list->next_packet;
} else { } else {
lrh_temp = lowpan6_data.reass_list; /* it wasn't the first, so it must have a valid 'prev' */
while (lrh_temp != NULL) { LWIP_ASSERT("sanity check linked list", prev != NULL);
if (lrh_temp->next_packet == lrh) { prev->next_packet = lrh->next_packet;
lrh_temp->next_packet = lrh->next_packet;
break;
}
lrh_temp = lrh_temp->next_packet;
}
} }
return ERR_OK;
} }
/** Write the IEEE 802.15.4 header that encapsulates the 6LoWPAN frame. /** Write the IEEE 802.15.4 header that encapsulates the 6LoWPAN frame.
@ -1281,7 +1274,7 @@ lowpan6_input(struct pbuf *p, struct netif *netif)
struct ieee_802154_addr src, dest; struct ieee_802154_addr src, dest;
u16_t datagram_size = 0; u16_t datagram_size = 0;
u16_t datagram_offset, datagram_tag; u16_t datagram_offset, datagram_tag;
struct lowpan6_reass_helper *lrh, *lrh_temp; struct lowpan6_reass_helper *lrh, *lrh_next, *lrh_prev = NULL;
if (p == NULL) { if (p == NULL) {
return ERR_OK; return ERR_OK;
@ -1310,6 +1303,8 @@ lowpan6_input(struct pbuf *p, struct netif *netif)
/* check for duplicate */ /* check for duplicate */
lrh = lowpan6_data.reass_list; lrh = lowpan6_data.reass_list;
while (lrh != NULL) { while (lrh != NULL) {
uint8_t discard = 0;
lrh_next = lrh->next_packet;
if ((lrh->sender_addr.addr_len == src.addr_len) && if ((lrh->sender_addr.addr_len == src.addr_len) &&
(memcmp(lrh->sender_addr.addr, src.addr, src.addr_len) == 0)) { (memcmp(lrh->sender_addr.addr, src.addr, src.addr_len) == 0)) {
/* address match with packet in reassembly. */ /* address match with packet in reassembly. */
@ -1318,17 +1313,17 @@ lowpan6_input(struct pbuf *p, struct netif *netif)
goto lowpan6_input_discard; goto lowpan6_input_discard;
} else { } else {
/* We are receiving the start of a new datagram. Discard old one (incomplete). */ /* We are receiving the start of a new datagram. Discard old one (incomplete). */
lrh_temp = lrh->next_packet; discard = 1;
dequeue_datagram(lrh);
free_reass_datagram(lrh);
/* Check next datagram in queue. */
lrh = lrh_temp;
} }
} else {
/* Check next datagram in queue. */
lrh = lrh->next_packet;
} }
if (discard) {
dequeue_datagram(lrh, lrh_prev);
free_reass_datagram(lrh);
} else {
lrh_prev = lrh;
}
/* Check next datagram in queue. */
lrh = lrh_next;
} }
pbuf_remove_header(p, 4); /* hide frag1 dispatch */ pbuf_remove_header(p, 4); /* hide frag1 dispatch */
@ -1370,7 +1365,7 @@ lowpan6_input(struct pbuf *p, struct netif *netif)
datagram_offset = (u16_t)puc[4] << 3; datagram_offset = (u16_t)puc[4] << 3;
pbuf_remove_header(p, 4); /* hide frag1 dispatch but keep datagram offset for reassembly */ pbuf_remove_header(p, 4); /* hide frag1 dispatch but keep datagram offset for reassembly */
for (lrh = lowpan6_data.reass_list; lrh != NULL; lrh = lrh->next_packet) { for (lrh = lowpan6_data.reass_list; lrh != NULL; lrh_prev = lrh, lrh = lrh->next_packet) {
if ((lrh->sender_addr.addr_len == src.addr_len) && if ((lrh->sender_addr.addr_len == src.addr_len) &&
(memcmp(lrh->sender_addr.addr, src.addr, src.addr_len) == 0) && (memcmp(lrh->sender_addr.addr, src.addr, src.addr_len) == 0) &&
(datagram_tag == lrh->datagram_tag) && (datagram_tag == lrh->datagram_tag) &&
@ -1389,7 +1384,7 @@ lowpan6_input(struct pbuf *p, struct netif *netif)
/* FRAG1 already received, check this offset against first len */ /* FRAG1 already received, check this offset against first len */
if (datagram_offset < lrh->reass->len) { if (datagram_offset < lrh->reass->len) {
/* fragment overlap, discard old fragments */ /* fragment overlap, discard old fragments */
dequeue_datagram(lrh); dequeue_datagram(lrh, lrh_prev);
free_reass_datagram(lrh); free_reass_datagram(lrh);
goto lowpan6_input_discard; goto lowpan6_input_discard;
} }
@ -1407,7 +1402,7 @@ lowpan6_input(struct pbuf *p, struct netif *netif)
if (datagram_offset < q_datagram_offset) { if (datagram_offset < q_datagram_offset) {
if (datagram_offset + new_frag_len > q_datagram_offset) { if (datagram_offset + new_frag_len > q_datagram_offset) {
/* overlap, discard old fragments */ /* overlap, discard old fragments */
dequeue_datagram(lrh); dequeue_datagram(lrh, lrh_prev);
free_reass_datagram(lrh); free_reass_datagram(lrh);
goto lowpan6_input_discard; goto lowpan6_input_discard;
} }
@ -1416,7 +1411,7 @@ lowpan6_input(struct pbuf *p, struct netif *netif)
} else if (datagram_offset == q_datagram_offset) { } else if (datagram_offset == q_datagram_offset) {
if (q_frag_len != new_frag_len) { if (q_frag_len != new_frag_len) {
/* fragment mismatch, discard old fragments */ /* fragment mismatch, discard old fragments */
dequeue_datagram(lrh); dequeue_datagram(lrh, lrh_prev);
free_reass_datagram(lrh); free_reass_datagram(lrh);
goto lowpan6_input_discard; goto lowpan6_input_discard;
} }
@ -1460,7 +1455,7 @@ lowpan6_input(struct pbuf *p, struct netif *netif)
q->next = lrh->frags; q->next = lrh->frags;
lrh->frags = NULL; lrh->frags = NULL;
lrh->reass = NULL; lrh->reass = NULL;
dequeue_datagram(lrh); dequeue_datagram(lrh, lrh_prev);
mem_free(lrh); mem_free(lrh);
/* @todo: distinguish unicast/multicast */ /* @todo: distinguish unicast/multicast */