From 5cfd0aa60e8b26cb915864d5560ffe40d2a3404a Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Tue, 19 Nov 2013 21:23:52 +0100
Subject: [PATCH] made stacks for RPL threads static and using pre-defined
 sizes

---
 sys/net/rpl/rpl.c     |  7 +++++++
 sys/net/rpl/trickle.c | 38 +++++++++++---------------------------
 sys/net/rpl/trickle.h |  8 ++++----
 3 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/sys/net/rpl/rpl.c b/sys/net/rpl/rpl.c
index f0858fb9a1a6..3bda5e3b51ab 100644
--- a/sys/net/rpl/rpl.c
+++ b/sys/net/rpl/rpl.c
@@ -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;
diff --git a/sys/net/rpl/trickle.c b/sys/net/rpl/trickle.c
index baa0e1d65626..1dc2a51a2170 100644
--- a/sys/net/rpl/trickle.c
+++ b/sys/net/rpl/trickle.c
@@ -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");
diff --git a/sys/net/rpl/trickle.h b/sys/net/rpl/trickle.h
index 5f2172004249..d3079d197289 100644
--- a/sys/net/rpl/trickle.h
+++ b/sys/net/rpl/trickle.h
@@ -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);