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

Merge pull request #639 from atiselsts/contrib/tsch-link-printing 

TSCH: improve the readability of add_link and remove_link messages
This commit is contained in:
Simon Duquennoy 2018-09-04 19:50:49 +02:00 committed by GitHub
parent 6968971226 c459d979f5
commit 86c3db944e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
os/net/mac/tsch/tsch-schedule.c
View File

@ -171,6 +171,45 @@ tsch_schedule_get_link_by_handle(uint16_t handle)
return NULL;
}
/*---------------------------------------------------------------------------*/
static const char *
print_link_options(uint16_t link_options)
{
static char buffer[20];
unsigned length;
buffer[0] = '\0';
if(link_options & LINK_OPTION_TX) {
strcat(buffer, "Tx|");
}
if(link_options & LINK_OPTION_RX) {
strcat(buffer, "Rx|");
}
if(link_options & LINK_OPTION_SHARED) {
strcat(buffer, "Sh|");
}
length = strlen(buffer);
if(length > 0) {
buffer[length - 1] = '\0';
}
return buffer;
}
/*---------------------------------------------------------------------------*/
static const char *
print_link_type(uint16_t link_type)
{
switch(link_type) {
case LINK_TYPE_NORMAL:
return "NORMAL";
case LINK_TYPE_ADVERTISING:
return "ADV";
case LINK_TYPE_ADVERTISING_ONLY:
return "ADV_ONLY";
default:
return "?";
}
}
/*---------------------------------------------------------------------------*/
/* Adds a link to a slotframe, return a pointer to it (NULL if failure) */
struct tsch_link *
tsch_schedule_add_link(struct tsch_slotframe *slotframe,
@ -218,8 +257,10 @@ tsch_schedule_add_link(struct tsch_slotframe *slotframe,
}
linkaddr_copy(&l->addr, address);
LOG_INFO("add_link %u %u %u %u %u ",
slotframe->handle, link_options, link_type, timeslot, channel_offset);
LOG_INFO("add_link sf=%u opt=%s type=%s ts=%u ch=%u addr=",
slotframe->handle,
print_link_options(link_options),
print_link_type(link_type), timeslot, channel_offset);
LOG_INFO_LLADDR(address);
LOG_INFO_("\n");
/* Release the lock before we update the neighbor (will take the lock) */
@ -260,8 +301,10 @@ tsch_schedule_remove_link(struct tsch_slotframe *slotframe, struct tsch_link *l)
if(l == current_link) {
current_link = NULL;
}
LOG_INFO("remove_link %u %u %u %u ",
slotframe->handle, l->link_options, l->timeslot, l->channel_offset);
LOG_INFO("remove_link sf=%u opt=%s type=%s ts=%u ch=%u addr=",
slotframe->handle,
print_link_options(l->link_options),
print_link_type(l->link_type), l->timeslot, l->channel_offset);
LOG_INFO_LLADDR(&l->addr);
LOG_INFO_("\n");