giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PRINTF():ed debugging output

Browse Source
This commit is contained in:
fros4943 2010-04-01 11:08:36 +00:00
parent cc11c9d3f2
commit 59357e8b75
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
core/net/rime/collect.c
View File

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: collect.c,v 1.45 2010/04/01 10:03:19 adamdunkels Exp $ * $Id: collect.c,v 1.46 2010/04/01 11:08:36 fros4943 Exp $
*/ */
/** /**
@ -130,11 +130,11 @@ update_rtmetric(struct collect_conn *tc)
struct collect_neighbor *n; struct collect_neighbor *n;
PRINTF("update_rtmetric: tc->rtmetric %d\n", tc->rtmetric); PRINTF("update_rtmetric: tc->rtmetric %d\n", tc->rtmetric);
/* We should only update the rtmetric if we are not the sink. */ /* We should only update the rtmetric if we are not the sink. */
if(tc->rtmetric != SINK) { if(tc->rtmetric != SINK) {
struct collect_neighbor *best; struct collect_neighbor *best;
/* Pick the neighbor to use as a parent. We normally use /* Pick the neighbor to use as a parent. We normally use
the parent in the n->parent. */ the parent in the n->parent. */
n = collect_neighbor_find(&tc->parent); n = collect_neighbor_find(&tc->parent);
@ -152,7 +152,7 @@ update_rtmetric(struct collect_conn *tc)
collect_neighbor_etx(best) < collect_neighbor_etx(best) <
collect_neighbor_etx(n) - COLLECT_NEIGHBOR_ETX_SCALE)) { collect_neighbor_etx(n) - COLLECT_NEIGHBOR_ETX_SCALE)) {
rimeaddr_copy(&tc->parent, &best->addr); rimeaddr_copy(&tc->parent, &best->addr);
printf("Switched parent to %d.%d\n", PRINTF("Switched parent to %d.%d\n",
tc->parent.u8[0], tc->parent.u8[1]); tc->parent.u8[0], tc->parent.u8[1]);
} }
@ -179,7 +179,7 @@ update_rtmetric(struct collect_conn *tc)
the expected transmissions to reach that neighbor. */ the expected transmissions to reach that neighbor. */
if(n->rtmetric + collect_neighbor_etx(n) != tc->rtmetric) { if(n->rtmetric + collect_neighbor_etx(n) != tc->rtmetric) {
uint16_t old_rtmetric = tc->rtmetric; uint16_t old_rtmetric = tc->rtmetric;
tc->rtmetric = n->rtmetric + collect_neighbor_etx(n); tc->rtmetric = n->rtmetric + collect_neighbor_etx(n);
#if ! COLLECT_ANNOUNCEMENTS #if ! COLLECT_ANNOUNCEMENTS
@ -243,7 +243,7 @@ send_queued_packet(void)
PRINTF("%d.%d: send_queued_packet queue len %d\n", PRINTF("%d.%d: send_queued_packet queue len %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
packetqueue_len(&sending_queue)); packetqueue_len(&sending_queue));
i = packetqueue_first(&sending_queue); i = packetqueue_first(&sending_queue);
if(i == NULL) { if(i == NULL) {
PRINTF("%d.%d: nothing on queue\n", PRINTF("%d.%d: nothing on queue\n",
@ -258,7 +258,7 @@ send_queued_packet(void)
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]); rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
return; return;
} }
if(c->sending) { if(c->sending) {
/* If we are currently sending a packet, we wait until the /* If we are currently sending a packet, we wait until the
packet is forwarded and try again then. */ packet is forwarded and try again then. */
@ -310,7 +310,7 @@ send_queued_packet(void)
} else { } else {
#if COLLECT_ANNOUNCEMENTS #if COLLECT_ANNOUNCEMENTS
#if COLLECT_CONF_WITH_LISTEN #if COLLECT_CONF_WITH_LISTEN
printf("listen\n"); PRINTF("listen\n");
announcement_listen(1); announcement_listen(1);
ctimer_set(&c->transmit_after_scan_timer, ANNOUNCEMENT_SCAN_TIME, ctimer_set(&c->transmit_after_scan_timer, ANNOUNCEMENT_SCAN_TIME,
send_queued_packet, NULL); send_queued_packet, NULL);
@ -349,8 +349,8 @@ handle_ack(struct collect_conn *tc)
if(rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_SENDER), if(rimeaddr_cmp(packetbuf_addr(PACKETBUF_ADDR_SENDER),
&tc->parent) && &tc->parent) &&
packetbuf_attr(PACKETBUF_ATTR_PACKET_ID) == tc->seqno) { packetbuf_attr(PACKETBUF_ATTR_PACKET_ID) == tc->seqno) {
msg = packetbuf_dataptr(); msg = packetbuf_dataptr();
memcpy(&rtmetric, &msg->rtmetric, sizeof(uint16_t)); memcpy(&rtmetric, &msg->rtmetric, sizeof(uint16_t));
n = collect_neighbor_find(packetbuf_addr(PACKETBUF_ADDR_SENDER)); n = collect_neighbor_find(packetbuf_addr(PACKETBUF_ADDR_SENDER));
@ -358,7 +358,7 @@ handle_ack(struct collect_conn *tc)
collect_neighbor_update(n, rtmetric); collect_neighbor_update(n, rtmetric);
update_rtmetric(tc); update_rtmetric(tc);
} }
PRINTF("%d.%d: ACK from %d.%d after %d transmissions, flags %02x\n", PRINTF("%d.%d: ACK from %d.%d after %d transmissions, flags %02x\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
tc->parent.u8[0], tc->parent.u8[1], tc->parent.u8[0], tc->parent.u8[1],
@ -380,12 +380,12 @@ send_ack(struct collect_conn *tc, const rimeaddr_t *to, int congestion, int drop
PRINTF("send_ack\n"); PRINTF("send_ack\n");
packet_seqno = packetbuf_attr(PACKETBUF_ATTR_PACKET_ID); packet_seqno = packetbuf_attr(PACKETBUF_ATTR_PACKET_ID);
q = queuebuf_new_from_packetbuf(); q = queuebuf_new_from_packetbuf();
if(q != NULL) { if(q != NULL) {
packetbuf_clear(); packetbuf_clear();
packetbuf_set_datalen(sizeof(struct ack_msg)); packetbuf_set_datalen(sizeof(struct ack_msg));
ack = packetbuf_dataptr(); ack = packetbuf_dataptr();
@ -402,15 +402,15 @@ send_ack(struct collect_conn *tc, const rimeaddr_t *to, int congestion, int drop
packetbuf_set_attr(PACKETBUF_ATTR_PACKET_ID, packet_seqno); packetbuf_set_attr(PACKETBUF_ATTR_PACKET_ID, packet_seqno);
packetbuf_set_attr(PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS, MAX_ACK_MAC_REXMITS); packetbuf_set_attr(PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS, MAX_ACK_MAC_REXMITS);
unicast_send(&tc->unicast_conn, to); unicast_send(&tc->unicast_conn, to);
PRINTF("%d.%d: collect: Sending ACK to %d.%d for %d\n", PRINTF("%d.%d: collect: Sending ACK to %d.%d for %d\n",
rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0],rimeaddr_node_addr.u8[1],
to->u8[0], to->u8[0],
to->u8[1], to->u8[1],
packet_seqno); packet_seqno);
RIMESTATS_ADD(acktx); RIMESTATS_ADD(acktx);
queuebuf_to_packetbuf(q); queuebuf_to_packetbuf(q);
queuebuf_free(q); queuebuf_free(q);
} else { } else {
@ -487,22 +487,22 @@ node_packet_received(struct unicast_conn *c, const rimeaddr_t *from)
rimeaddr_copy(&recent_packets[recent_packet_ptr].sent_to, rimeaddr_copy(&recent_packets[recent_packet_ptr].sent_to,
&rimeaddr_null); &rimeaddr_null);
} }
recent_packet_ptr = (recent_packet_ptr + 1) % NUM_RECENT_PACKETS; recent_packet_ptr = (recent_packet_ptr + 1) % NUM_RECENT_PACKETS;
if(tc->rtmetric == SINK) { if(tc->rtmetric == SINK) {
/* If we are the sink, we call the receive function. */ /* If we are the sink, we call the receive function. */
send_ack(tc, &ack_to, 0, 0, 0); send_ack(tc, &ack_to, 0, 0, 0);
PRINTF("%d.%d: sink received packet %d from %d.%d via %d.%d\n", PRINTF("%d.%d: sink received packet %d from %d.%d via %d.%d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
packetbuf_attr(PACKETBUF_ATTR_EPACKET_ID), packetbuf_attr(PACKETBUF_ATTR_EPACKET_ID),
packetbuf_addr(PACKETBUF_ADDR_ESENDER)->u8[0], packetbuf_addr(PACKETBUF_ADDR_ESENDER)->u8[0],
packetbuf_addr(PACKETBUF_ADDR_ESENDER)->u8[1], packetbuf_addr(PACKETBUF_ADDR_ESENDER)->u8[1],
from->u8[0], from->u8[1]); from->u8[0], from->u8[1]);
if(tc->cb->recv != NULL) { if(tc->cb->recv != NULL) {
tc->cb->recv(packetbuf_addr(PACKETBUF_ADDR_ESENDER), tc->cb->recv(packetbuf_addr(PACKETBUF_ADDR_ESENDER),
packetbuf_attr(PACKETBUF_ATTR_EPACKET_ID), packetbuf_attr(PACKETBUF_ATTR_EPACKET_ID),
@ -511,20 +511,20 @@ node_packet_received(struct unicast_conn *c, const rimeaddr_t *from)
return; return;
} else if(packetbuf_attr(PACKETBUF_ATTR_TTL) > 1 && } else if(packetbuf_attr(PACKETBUF_ATTR_TTL) > 1 &&
tc->rtmetric != RTMETRIC_MAX) { tc->rtmetric != RTMETRIC_MAX) {
/* If we are not the sink, we forward the packet to the best /* If we are not the sink, we forward the packet to the best
neighbor. */ neighbor. */
packetbuf_set_attr(PACKETBUF_ATTR_HOPS, packetbuf_attr(PACKETBUF_ATTR_HOPS) + 1); packetbuf_set_attr(PACKETBUF_ATTR_HOPS, packetbuf_attr(PACKETBUF_ATTR_HOPS) + 1);
packetbuf_set_attr(PACKETBUF_ATTR_TTL, packetbuf_attr(PACKETBUF_ATTR_TTL) - 1); packetbuf_set_attr(PACKETBUF_ATTR_TTL, packetbuf_attr(PACKETBUF_ATTR_TTL) - 1);
PRINTF("%d.%d: packet received from %d.%d via %d.%d, sending %d, max_rexmits %d\n", PRINTF("%d.%d: packet received from %d.%d via %d.%d, sending %d, max_rexmits %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
packetbuf_addr(PACKETBUF_ADDR_ESENDER)->u8[0], packetbuf_addr(PACKETBUF_ADDR_ESENDER)->u8[0],
packetbuf_addr(PACKETBUF_ADDR_ESENDER)->u8[1], packetbuf_addr(PACKETBUF_ADDR_ESENDER)->u8[1],
from->u8[0], from->u8[1], tc->sending, from->u8[0], from->u8[1], tc->sending,
packetbuf_attr(PACKETBUF_ATTR_MAX_REXMIT)); packetbuf_attr(PACKETBUF_ATTR_MAX_REXMIT));
if(packetqueue_enqueue_packetbuf(&sending_queue, FORWARD_PACKET_LIFETIME, if(packetqueue_enqueue_packetbuf(&sending_queue, FORWARD_PACKET_LIFETIME,
tc)) { tc)) {
send_ack(tc, &ack_to, 0, 0, 0); send_ack(tc, &ack_to, 0, 0, 0);
@ -569,7 +569,7 @@ node_packet_sent(struct unicast_conn *c, int status, int transmissions)
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
tc->parent.u8[0], tc->parent.u8[1], tc->parent.u8[0], tc->parent.u8[1],
transmissions); transmissions);
/* neighbor_update_etx(neighbor_find(to), transmissions); /* neighbor_update_etx(neighbor_find(to), transmissions);
update_rtmetric(tc);*/ update_rtmetric(tc);*/
tc->transmissions += transmissions; tc->transmissions += transmissions;
@ -603,7 +603,7 @@ timedout(struct collect_conn *tc)
PRINTF("%d.%d: timedout after %d retransmissions (max retransmissions %d): packet dropped\n", PRINTF("%d.%d: timedout after %d retransmissions (max retransmissions %d): packet dropped\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], tc->transmissions, rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], tc->transmissions,
tc->max_rexmits); tc->max_rexmits);
tc->sending = 0; tc->sending = 0;
collect_neighbor_timedout_etx(collect_neighbor_find(&tc->parent), tc->transmissions); collect_neighbor_timedout_etx(collect_neighbor_find(&tc->parent), tc->transmissions);
update_rtmetric(tc); update_rtmetric(tc);
@ -633,7 +633,7 @@ adv_received(struct neighbor_discovery_conn *c, const rimeaddr_t *from,
struct collect_conn *tc = (struct collect_conn *) struct collect_conn *tc = (struct collect_conn *)
((char *)c - offsetof(struct collect_conn, neighbor_discovery_conn)); ((char *)c - offsetof(struct collect_conn, neighbor_discovery_conn));
struct collect_neighbor *n; struct collect_neighbor *n;
n = collect_neighbor_find(from); n = collect_neighbor_find(from);
if(n == NULL) { if(n == NULL) {
@ -655,7 +655,7 @@ received_announcement(struct announcement *a, const rimeaddr_t *from,
struct collect_conn *tc = (struct collect_conn *) struct collect_conn *tc = (struct collect_conn *)
((char *)a - offsetof(struct collect_conn, announcement)); ((char *)a - offsetof(struct collect_conn, announcement));
struct collect_neighbor *n; struct collect_neighbor *n;
n = collect_neighbor_find(from); n = collect_neighbor_find(from);
if(n == NULL) { if(n == NULL) {
@ -753,19 +753,19 @@ int
collect_send(struct collect_conn *tc, int rexmits) collect_send(struct collect_conn *tc, int rexmits)
{ {
struct collect_neighbor *n; struct collect_neighbor *n;
packetbuf_set_attr(PACKETBUF_ATTR_EPACKET_ID, tc->eseqno++); packetbuf_set_attr(PACKETBUF_ATTR_EPACKET_ID, tc->eseqno++);
packetbuf_set_addr(PACKETBUF_ADDR_ESENDER, &rimeaddr_node_addr); packetbuf_set_addr(PACKETBUF_ADDR_ESENDER, &rimeaddr_node_addr);
packetbuf_set_attr(PACKETBUF_ATTR_HOPS, 1); packetbuf_set_attr(PACKETBUF_ATTR_HOPS, 1);
packetbuf_set_attr(PACKETBUF_ATTR_TTL, MAX_HOPLIM); packetbuf_set_attr(PACKETBUF_ATTR_TTL, MAX_HOPLIM);
packetbuf_set_attr(PACKETBUF_ATTR_MAX_REXMIT, rexmits); packetbuf_set_attr(PACKETBUF_ATTR_MAX_REXMIT, rexmits);
PRINTF("%d.%d: originating packet %d, max_rexmits %d\n", PRINTF("%d.%d: originating packet %d, max_rexmits %d\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
packetbuf_attr(PACKETBUF_ATTR_EPACKET_ID), packetbuf_attr(PACKETBUF_ATTR_EPACKET_ID),
packetbuf_attr(PACKETBUF_ATTR_MAX_REXMIT)); packetbuf_attr(PACKETBUF_ATTR_MAX_REXMIT));
PRINTF("rexmit %d\n", rexmits); PRINTF("rexmit %d\n", rexmits);
if(tc->rtmetric == SINK) { if(tc->rtmetric == SINK) {
@ -799,12 +799,12 @@ collect_send(struct collect_conn *tc, int rexmits)
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]); rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
#if COLLECT_ANNOUNCEMENTS #if COLLECT_ANNOUNCEMENTS
#if COLLECT_CONF_WITH_LISTEN #if COLLECT_CONF_WITH_LISTEN
printf("listen\n"); PRINTF("listen\n");
announcement_listen(1); announcement_listen(1);
ctimer_set(&tc->transmit_after_scan_timer, ANNOUNCEMENT_SCAN_TIME, ctimer_set(&tc->transmit_after_scan_timer, ANNOUNCEMENT_SCAN_TIME,
send_queued_packet, NULL); send_queued_packet, NULL);
#else /* COLLECT_CONF_WITH_LISTEN */ #else /* COLLECT_CONF_WITH_LISTEN */
printf("bump neighbor value\n"); PRINTF("bump neighbor value\n");
announcement_set_value(&tc->announcement, RTMETRIC_MAX); announcement_set_value(&tc->announcement, RTMETRIC_MAX);
announcement_bump(&tc->announcement); announcement_bump(&tc->announcement);
#endif /* COLLECT_CONF_WITH_LISTEN */ #endif /* COLLECT_CONF_WITH_LISTEN */