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

made stacks for RPL threads static and using pre-defined sizes

Browse Source
This commit is contained in:
Oleg Hahm 2013-11-19 21:23:52 +01:00
parent a0132f7595
commit 5cfd0aa60e
3 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/net/rpl/rpl.c
View File

@ -30,6 +30,13 @@
#include "sixlowpan.h"
#define ENABLE_DEBUG (0)
#if ENABLE_DEBUG
#undef TRICKLE_TIMER_STACKSIZE
#define TRICKLE_TIMER_STACKSIZE (KERNEL_CONF_STACKSIZE_MAIN)
#endif
#include "debug.h"
char rpl_process_buf[RPL_PROCESS_STACKSIZE];
/* global variables */
char i_am_root = 0;

38
sys/net/rpl/trickle.c
View File

@ -20,15 +20,20 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include "inttypes.h"
#include "trickle.h"
#include "rpl.h"
//TODO in pointer umwandeln, speicher mit malloc holen
char *timer_over_buf;
char *interval_over_buf;
char *dao_delay_over_buf;
#define ENABLE_DEBUG (0)
#include "debug.h"
/* thread stacks */
char timer_over_buf[TRICKLE_TIMER_STACKSIZE];
char interval_over_buf[TRICKLE_INTERVAL_STACKSIZE];
char dao_delay_over_buf[DAO_DELAY_STACKSIZE];
char routing_table_buf[RT_STACKSIZE];
int timer_over_pid;
int interval_over_pid;
int dao_delay_over_pid;
@ -71,27 +76,6 @@ void reset_trickletimer(void)
void init_trickle(void)
{
timer_over_buf = calloc(TRICKLE_TIMER_STACKSIZE, sizeof(char));
if (timer_over_buf == NULL) {
puts("[ERROR] Could not allocate enough memory for timer_over_buf!");
return;
}
interval_over_buf = calloc(TRICKLE_INTERVAL_STACKSIZE, sizeof(char));
if (interval_over_buf == NULL) {
puts("[ERROR] Could not allocate enough memory for interval_over_buf!");
return;
}
dao_delay_over_buf = calloc(DAO_DELAY_STACKSIZE, sizeof(char));
if (dao_delay_over_buf == NULL) {
puts("[ERROR] Could not allocate enough memory for interval_over_buf!");
return;
}
/* Create threads */
ack_received = true;
timer_over_pid = thread_create(timer_over_buf, TRICKLE_TIMER_STACKSIZE,
@ -145,7 +129,7 @@ void trickle_timer_over(void)
while (1) {
thread_sleep();
/* Laut RPL Spezifikation soll k=0 wie k= Unendlich behandelt werden, also immer gesendet werden */
/* Handle k=0 like k=infinity (according to RFC6206, section 6.5) */
if ((c < k) || (k == 0)) {
send_DIO(&mcast);
}
@ -157,7 +141,7 @@ void trickle_interval_over(void)
while (1) {
thread_sleep();
I = I * 2;
printf("TRICKLE new Interval %"PRIu32"\n", I);
DEBUG("TRICKLE new Interval %"PRIu32"\n", I);
if (I == 0) {
puts("[WARNING] Interval was 0");

8
sys/net/rpl/trickle.h
View File

@ -18,10 +18,10 @@
#include <vtimer.h>
#include <thread.h>
#define TRICKLE_TIMER_STACKSIZE 3072
#define TRICKLE_INTERVAL_STACKSIZE 3072
#define DAO_DELAY_STACKSIZE 3072
#define RT_STACKSIZE 512
#define TRICKLE_TIMER_STACKSIZE (KERNEL_CONF_STACKSIZE_DEFAULT)
#define TRICKLE_INTERVAL_STACKSIZE (KERNEL_CONF_STACKSIZE_MAIN)
#define DAO_DELAY_STACKSIZE (KERNEL_CONF_STACKSIZE_MAIN)
#define RT_STACKSIZE (KERNEL_CONF_STACKSIZE_DEFAULT)
void reset_trickletimer(void);
void init_trickle(void);