kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

gnrc_gomach: add number limit for allocated slots.

Browse Source
This commit is contained in:
zhuoshuguo 2017-12-19 10:18:51 +01:00
parent 16013413be
commit a98c3f0d31
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/include/net/gnrc/gomach/gomach.h
View File

@ -265,17 +265,6 @@ extern "C" {
#define GNRC_GOMACH_RX_DUPCHK_UNIT_LIFE (30U)
#endif
/**
* @brief Maximum number of slots allowed to be allocated in one cycle.
*
* GoMacH dynamically allocates transmission slots to senders that have
* pending packets.This macro defines the maximum number of slots allowed
* to be allocated in one cycle.
*/
#ifndef GNRC_GOMACH_MAX_ALLOC_SLOTS_NUM
#define GNRC_GOMACH_MAX_ALLOC_SLOTS_NUM (25U)
#endif
/**
* @brief Maximum number of senders allowed to be allocated slots in one cycle.
*

8
sys/net/gnrc/link_layer/gomach/gomach_internal.c
View File

@ -467,6 +467,10 @@ int gnrc_gomach_send_beacon(gnrc_netif_t *netif)
gnrc_gomach_l2_id_t id_list[GNRC_GOMACH_SLOSCH_UNIT_COUNT];
uint8_t slots_list[GNRC_GOMACH_SLOSCH_UNIT_COUNT];
/* Calculate how many slots left can be allocated to senders. */
uint16_t max_slot_num = (GNRC_GOMACH_SUPERFRAME_DURATION_US - gnrc_gomach_phase_now(netif)) /
GNRC_GOMACH_VTDMA_SLOT_SIZE_US;
for (i = 0; i < GNRC_GOMACH_SLOSCH_UNIT_COUNT; i++) {
if (netif->mac.rx.slosch_list[i].queue_indicator > 0) {
/* Record the device's (that will be allocated slots) address to the ID list. */
@ -481,9 +485,9 @@ int gnrc_gomach_send_beacon(gnrc_netif_t *netif)
total_tdma_slot_num += slots_list[j];
/* If there is no room for allocating more slots, stop. */
if (total_tdma_slot_num >= GNRC_GOMACH_MAX_ALLOC_SLOTS_NUM) {
if (total_tdma_slot_num >= max_slot_num) {
uint8_t redueced_slots_num;
redueced_slots_num = total_tdma_slot_num - GNRC_GOMACH_MAX_ALLOC_SLOTS_NUM;
redueced_slots_num = total_tdma_slot_num - max_slot_num;
slots_list[j] -= redueced_slots_num;
total_tdma_slot_num -= redueced_slots_num;
break;