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

Removed old netsim code. Added a function for obtaining the packet attributes of a queuebuf packet.

Browse source
This commit is contained in:
adamdunkels 2010-10-04 20:26:01 +00:00
parent 67c76649d9
commit 212e73faa6
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/net/queuebuf.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: queuebuf.c,v 1.2 2010/06/24 09:48:21 nifi Exp $ * $Id: queuebuf.c,v 1.3 2010/10/04 20:26:01 adamdunkels Exp $
*/ */
/** /**
@ -116,11 +116,6 @@ queuebuf_new_from_packetbuf(void)
if(rbuf != NULL) { if(rbuf != NULL) {
#if QUEUEBUF_STATS #if QUEUEBUF_STATS
++queuebuf_ref_len; ++queuebuf_ref_len;
#if CONTIKI_TARGET_NETSIM
/* node_log("%d %d\n",
queuebuf_len,
queuebuf_ref_len);*/
#endif /* CONTIKI_TARGET_NETSIM */
#endif /* QUEUEBUF_STATS */ #endif /* QUEUEBUF_STATS */
rbuf->len = packetbuf_datalen(); rbuf->len = packetbuf_datalen();
rbuf->ref = packetbuf_reference_ptr(); rbuf->ref = packetbuf_reference_ptr();
@ -135,16 +130,12 @@ queuebuf_new_from_packetbuf(void)
#if QUEUEBUF_STATS #if QUEUEBUF_STATS
++queuebuf_len; ++queuebuf_len;
PRINTF("queuebuf len %d\n", queuebuf_len); PRINTF("queuebuf len %d\n", queuebuf_len);
printf("#A q=%d\n", queuebuf_len);
if(queuebuf_len == queuebuf_max_len + 1) { if(queuebuf_len == queuebuf_max_len + 1) {
memb_free(&bufmem, buf); memb_free(&bufmem, buf);
queuebuf_len--; queuebuf_len--;
return NULL; return NULL;
} }
#if CONTIKI_TARGET_NETSIM
/* node_log("%d %d\n",
queuebuf_len,
queuebuf_ref_len);*/
#endif /* CONTIKI_TARGET_NETSIM */
#endif /* QUEUEBUF_STATS */ #endif /* QUEUEBUF_STATS */
buf->len = packetbuf_copyto(buf->data); buf->len = packetbuf_copyto(buf->data);
packetbuf_attr_copyto(buf->attrs, buf->addrs); packetbuf_attr_copyto(buf->attrs, buf->addrs);
@ -162,21 +153,12 @@ queuebuf_free(struct queuebuf *buf)
memb_free(&bufmem, buf); memb_free(&bufmem, buf);
#if QUEUEBUF_STATS #if QUEUEBUF_STATS
--queuebuf_len; --queuebuf_len;
#if CONTIKI_TARGET_NETSIM printf("#A q=%d\n", queuebuf_len);
/* node_log("%d %d\n",
queuebuf_len,
queuebuf_ref_len);*/
#endif /* CONTIKI_TARGET_NETSIM */
#endif /* QUEUEBUF_STATS */ #endif /* QUEUEBUF_STATS */
} else if(memb_inmemb(&refbufmem, buf)) { } else if(memb_inmemb(&refbufmem, buf)) {
memb_free(&refbufmem, buf); memb_free(&refbufmem, buf);
#if QUEUEBUF_STATS #if QUEUEBUF_STATS
--queuebuf_ref_len; --queuebuf_ref_len;
#if CONTIKI_TARGET_NETSIM
/* node_log("%d %d\n",
queuebuf_len,
queuebuf_ref_len);*/
#endif /* CONTIKI_TARGET_NETSIM */
#endif /* QUEUEBUF_STATS */ #endif /* QUEUEBUF_STATS */
} }
} }
@ -224,4 +206,10 @@ queuebuf_addr(struct queuebuf *b, uint8_t type)
return &b->addrs[type - PACKETBUF_ADDR_FIRST].addr; return &b->addrs[type - PACKETBUF_ADDR_FIRST].addr;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
packetbuf_attr_t
queuebuf_attr(struct queuebuf *b, uint8_t type)
{
return b->attrs[type].val;
}
/*---------------------------------------------------------------------------*/
/** @} */ /** @} */

3
core/net/queuebuf.h
View file

@ -41,7 +41,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: queuebuf.h,v 1.1 2010/06/14 19:19:16 adamdunkels Exp $ * $Id: queuebuf.h,v 1.2 2010/10/04 20:26:01 adamdunkels Exp $
*/ */
/** /**
@ -68,6 +68,7 @@ void *queuebuf_dataptr(struct queuebuf *b);
int queuebuf_datalen(struct queuebuf *b); int queuebuf_datalen(struct queuebuf *b);
rimeaddr_t *queuebuf_addr(struct queuebuf *b, uint8_t type); rimeaddr_t *queuebuf_addr(struct queuebuf *b, uint8_t type);
packetbuf_attr_t queuebuf_attr(struct queuebuf *b, uint8_t type);
#endif /* __QUEUEBUF_H__ */ #endif /* __QUEUEBUF_H__ */