deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix: handle deferred transmissions correctly (don't count them)

Browse source
This commit is contained in:
adamdunkels 2010-03-09 13:20:08 +00:00
parent 79722b4247
commit 2c3d3e3d73
1 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
core/net/mac/csma.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: csma.c,v 1.11 2010/03/04 14:17:43 nvt-se Exp $ * $Id: csma.c,v 1.12 2010/03/09 13:20:08 adamdunkels Exp $
*/ */
/** /**
@ -54,7 +54,7 @@
#include <string.h> #include <string.h>
#define DEBUG 0 #define DEBUG 1
#if DEBUG #if DEBUG
#include <stdio.h> #include <stdio.h>
#define PRINTF(...) printf(__VA_ARGS__) #define PRINTF(...) printf(__VA_ARGS__)
@ -69,7 +69,7 @@ struct queued_packet {
mac_callback_t sent; mac_callback_t sent;
void *cptr; void *cptr;
uint8_t transmissions, max_transmissions; uint8_t transmissions, max_transmissions;
uint8_t collisions; uint8_t collisions, deferrals;
}; };
#define MAX_QUEUED_PACKETS 8 #define MAX_QUEUED_PACKETS 8
@ -96,11 +96,25 @@ packet_sent(void *ptr, int status, int num_transmissions)
void *cptr; void *cptr;
int num_tx; int num_tx;
switch(status) {
case MAC_TX_OK:
case MAC_TX_NOACK:
q->transmissions++;
break;
case MAC_TX_COLLISION:
q->collisions++;
break;
case MAC_TX_DEFERRED:
q->deferrals++;
break;
}
sent = q->sent; sent = q->sent;
cptr = q->cptr; cptr = q->cptr;
num_tx = q->transmissions - q->collisions; num_tx = q->transmissions - q->collisions - q->deferrals;
if(status != MAC_TX_OK) { if(status == MAC_TX_COLLISION ||
status == MAC_TX_NOACK) {
switch(status) { switch(status) {
case MAC_TX_COLLISION: case MAC_TX_COLLISION:
PRINTF("csma: rexmit collision %d\n", q->transmissions); PRINTF("csma: rexmit collision %d\n", q->transmissions);
@ -127,7 +141,11 @@ packet_sent(void *ptr, int status, int num_transmissions)
mac_call_sent_callback(sent, cptr, status, num_tx); mac_call_sent_callback(sent, cptr, status, num_tx);
} }
} else { } else {
PRINTF("csma: rexmit ok %d\n", q->transmissions); if(status == MAC_TX_OK) {
PRINTF("csma: rexmit ok %d\n", q->transmissions);
} else {
PRINTF("csma: rexmit err %d %d\n", status, q->transmissions);
}
free_packet(q); free_packet(q);
mac_call_sent_callback(sent, cptr, status, num_tx); mac_call_sent_callback(sent, cptr, status, num_tx);
} }
@ -139,7 +157,6 @@ retransmit_packet(void *ptr)
struct queued_packet *q = ptr; struct queued_packet *q = ptr;
queuebuf_to_packetbuf(q->buf); queuebuf_to_packetbuf(q->buf);
q->transmissions++;
PRINTF("csma: resending number %d\n", q->transmissions); PRINTF("csma: resending number %d\n", q->transmissions);
NETSTACK_RDC.send(packet_sent, q); NETSTACK_RDC.send(packet_sent, q);
} }
@ -159,16 +176,29 @@ sent_packet(void *ptr, int status, int num_transmissions)
if(status != MAC_TX_OK) { if(status != MAC_TX_OK) {
switch(status) { switch(status) {
case MAC_TX_COLLISION: case MAC_TX_COLLISION:
PRINTF("csma: collision\n"); PRINTF("csma 1: collision\n");
break; break;
case MAC_TX_NOACK: case MAC_TX_NOACK:
PRINTF("csma: noack\n"); PRINTF("csma 1: noack\n");
break; break;
default: default:
PRINTF("csma: err %d\n", status); PRINTF("csma 1: err %d\n", status);
} }
} else { } else {
PRINTF("csma: ok\n"); PRINTF("csma 1: ok\n");
}
switch(status) {
case MAC_TX_OK:
case MAC_TX_NOACK:
q->transmissions++;
break;
case MAC_TX_COLLISION:
q->collisions++;
break;
case MAC_TX_DEFERRED:
q->deferrals++;
break;
} }
/* Check if we saw a collission, and if we have a queuebuf with the /* Check if we saw a collission, and if we have a queuebuf with the
@ -214,8 +244,9 @@ send_packet(mac_callback_t sent, void *ptr)
q->buf = queuebuf_new_from_packetbuf(); q->buf = queuebuf_new_from_packetbuf();
if(q != NULL) { if(q != NULL) {
q->max_transmissions = packetbuf_attr(PACKETBUF_ATTR_MAX_MAC_REXMIT) + 1; q->max_transmissions = packetbuf_attr(PACKETBUF_ATTR_MAX_MAC_REXMIT) + 1;
q->transmissions = 1; q->transmissions = 0;
q->collisions = 0; q->collisions = 0;
q->deferrals = 0;
q->sent = sent; q->sent = sent;
q->cptr = ptr; q->cptr = ptr;
NETSTACK_RDC.send(sent_packet, q); NETSTACK_RDC.send(sent_packet, q);