[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/lqi
LqiForwardingEngineP.nc, 1.5, 1.6 LqiRoutingEngineP.nc, 1.3, 1.4
Phil Levis
scipio at users.sourceforge.net
Fri Apr 13 17:41:03 PDT 2007
Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/lqi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2464/lqi
Modified Files:
LqiForwardingEngineP.nc LqiRoutingEngineP.nc
Log Message:
Copyrights and fixes
Index: LqiForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/lqi/LqiForwardingEngineP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LqiForwardingEngineP.nc 13 Apr 2007 21:45:25 -0000 1.5
--- LqiForwardingEngineP.nc 14 Apr 2007 00:40:59 -0000 1.6
***************
*** 249,252 ****
--- 249,256 ----
msg,
call SubPacket.payloadLength(msg)) == SUCCESS) {
+ call CollectionDebug.logEventMsg(NET_C_DBG_1,
+ call CollectionPacket.getSequenceNumber(msg),
+ call CollectionPacket.getOrigin(msg),
+ call AMPacket.destination(msg));
dbg("LQI", "%s: Send to %hu success.\n", __FUNCTION__, call AMPacket.destination(msg));
}
***************
*** 261,265 ****
call CollectionDebug.logEventMsg(NET_C_FE_RCV_MSG,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 265,269 ----
call CollectionDebug.logEventMsg(NET_C_FE_RCV_MSG,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 280,284 ****
message_t* nextMsg() {
int i;
! int inc = call Random.rand16();
for (i = 0; i < FWD_QUEUE_SIZE; i++) {
int pindex = (i + inc) % FWD_QUEUE_SIZE;
--- 284,288 ----
message_t* nextMsg() {
int i;
! uint16_t inc = call Random.rand16() & 0xfff;
for (i = 0; i < FWD_QUEUE_SIZE; i++) {
int pindex = (i + inc) % FWD_QUEUE_SIZE;
***************
*** 303,307 ****
dbg("LQI", "Packet not acked, retransmit @%s:\n\t%s\n", sim_time_string(), fields(msg));
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 307,311 ----
dbg("LQI", "Packet not acked, retransmit @%s:\n\t%s\n", sim_time_string(), fields(msg));
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 310,314 ****
} else {
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 314,318 ----
} else {
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 320,324 ****
else if (fail_count >= 5) {
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL_ACK_FWD,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 324,328 ----
else if (fail_count >= 5) {
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL_ACK_FWD,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 328,332 ****
dbg("LQI", "Packet acked:\t%s\n", fields(msg));
call CollectionDebug.logEventMsg(NET_C_FE_FWD_MSG,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 332,336 ----
dbg("LQI", "Packet acked:\t%s\n", fields(msg));
call CollectionDebug.logEventMsg(NET_C_FE_FWD_MSG,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 360,364 ****
dbg("LQI", "Packet not acked, retransmit (%hhu) @%s:\n\t%s\n", fail_count, sim_time_string(), fields(msg));
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 364,368 ----
dbg("LQI", "Packet not acked, retransmit (%hhu) @%s:\n\t%s\n", fail_count, sim_time_string(), fields(msg));
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 367,371 ****
} else {
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 371,375 ----
} else {
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 377,381 ****
else if (fail_count >= 5) {
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL_ACK_SEND,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 381,385 ----
else if (fail_count >= 5) {
call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL_ACK_SEND,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 385,389 ****
dbg("LQI", "Packet acked:\t%s\n", fields(msg));
call CollectionDebug.logEventMsg(NET_C_FE_SENT_MSG,
! call CollectionPacket.getTestNetworkSeq(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
--- 389,393 ----
dbg("LQI", "Packet acked:\t%s\n", fields(msg));
call CollectionDebug.logEventMsg(NET_C_FE_SENT_MSG,
! call CollectionPacket.getSequenceNumber(msg),
call CollectionPacket.getOrigin(msg),
call AMPacket.destination(msg));
***************
*** 505,513 ****
}
- command uint16_t CollectionPacket.getTestNetworkSeq(message_t* msg) {
- TestNetworkMsg *tn;
- tn = (TestNetworkMsg *)call Packet.getPayload(msg, NULL);
- return tn->seqno;
- }
--- 509,512 ----
Index: LqiRoutingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/lqi/LqiRoutingEngineP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LqiRoutingEngineP.nc 13 Apr 2007 00:10:48 -0000 1.3
--- LqiRoutingEngineP.nc 14 Apr 2007 00:40:59 -0000 1.4
***************
*** 90,94 ****
int16_t gCurrentSeqNo;
!
uint16_t gUpdateInterval;
--- 90,95 ----
int16_t gCurrentSeqNo;
! int16_t gOriginSeqNo;
!
uint16_t gUpdateInterval;
***************
*** 138,142 ****
bMsg->originaddr = TOS_NODE_ID;
bMsg->hopcount = 0;
- bMsg->originseqno = gCurrentSeqNo;
bMsg->seqno = gCurrentSeqNo++;
}
--- 139,142 ----
***************
*** 146,150 ****
bMsg->originaddr = TOS_NODE_ID;
bMsg->hopcount = gbCurrentHopCount;
- bMsg->originseqno = gCurrentSeqNo;
bMsg->seqno = gCurrentSeqNo++;
}
--- 146,149 ----
***************
*** 190,193 ****
--- 189,193 ----
gbCurrentCost = 0xfffe;
+ gOriginSeqNo = 0;
gCurrentSeqNo = 0;
gUpdateInterval = BEACON_PERIOD;
***************
*** 281,285 ****
header->originaddr = TOS_NODE_ID;
! header->originseqno = gCurrentSeqNo;
header->seqno = gCurrentSeqNo;
--- 281,285 ----
header->originaddr = TOS_NODE_ID;
! header->originseqno = gOriginSeqNo++;
header->seqno = gCurrentSeqNo;
More information about the Tinyos-2-commits
mailing list