X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fsignal_test.c;h=3b5ff1cbf8d096a9820f9bac1f3921cba94caaed;hb=8f2036c05d9a8531400c1ab97dca9193e92187d3;hp=ddd26485e4092eeed0db271470a5cf7b71074643;hpb=ab5b34edd4fbb2eda01fa74a98796fb8c736bb80;p=bertos.git

diff --git a/bertos/kern/signal_test.c b/bertos/kern/signal_test.c
index ddd26485..3b5ff1cb 100644
--- a/bertos/kern/signal_test.c
+++ b/bertos/kern/signal_test.c
@@ -31,13 +31,20 @@
  * -->
  *
  * \brief Signals test.
- * 
+ *
  * \version $Id$
- * 
+ *
  * \author Daniele Basile <asterix@develer.com>
+ *
+ * $test$: cp bertos/cfg/cfg_proc.h $cfgdir/
+ * $test$: echo  "#undef CONFIG_KERN" >> $cfgdir/cfg_proc.h
+ * $test$: echo "#define CONFIG_KERN 1" >> $cfgdir/cfg_proc.h
+ * $test$: cp bertos/cfg/cfg_signal.h $cfgdir/
+ * $test$: echo  "#undef CONFIG_KERN_SIGNALS" >> $cfgdir/cfg_signal.h
+ * $test$: echo "#define CONFIG_KERN_SIGNALS 1" >> $cfgdir/cfg_signal.h
  */
 
-#include <cfg/cfg_timer.h>
+#include "cfg/cfg_timer.h"
 #include <cfg/debug.h>
 #include <cfg/test.h>
 
@@ -56,7 +63,7 @@ int test_signal[] = {
 	SIG_TIMEOUT,
 	SIG_SYSTEM5,
 	SIG_SYSTEM6,
-	SIG_SINGLE	
+	SIG_SINGLE
 };
 
 // Current signal to send
@@ -65,37 +72,35 @@ int count = 0;
 sigmask_t sig_to_master;
 sigmask_t sig_to_slave;
 
-#define PROC_TEST_SLAVE(index, signal) static void proc_test##index(void) \
+/*
+ * These macros generate the code needed to create the test process functions.
+ */
+#define PROC_TEST_SLAVE(index, signal) \
+static void proc_signalTest##index(void) \
 { \
-	for(;;) \
-	{ \
-		kprintf("> Slave [%d]: Wait signal [%d]\n", index, signal); \
-		sig_wait(signal); \
-		kprintf("> Slave [%d]: send signal [%d]\n", index, signal); \
-		sig_signal(proc_currentUserData(), signal); \
-	} \
-} \
+	kputs("> Slave [" #index "]: Wait signal [" #signal "]\n"); \
+	sig_wait(signal); \
+	kputs("> Slave [" #index "]: send signal [" #signal "]\n"); \
+	sig_send(proc_currentUserData(), signal); \
+}
 
 #define MAIN_CHECK_SIGNAL(index, slave) \
 	do { \
 		kprintf("> Main: send signal [%d]\n", test_signal[index]); \
-		sig_signal(slave, test_signal[index]); \
+		sig_send(slave, test_signal[index]); \
 		kprintf("> Main: wait signal [%d]\n", test_signal[index]); \
 		sig_wait(test_signal[index]); \
 		count++; \
 	} while(0) \
 
-#define PROC_TEST_SLAVE_STACK(index) static cpu_stack_t proc_test##index##_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpu_stack_t)];
-#define PROC_TEST_SLAVE_INIT(index, master_process) proc_new(proc_test##index, master_process, sizeof(proc_test##index##_stack), proc_test##index##_stack)
+#if CONFIG_KERN_HEAP
 
-PROC_TEST_SLAVE(0, SIG_USER0)
-PROC_TEST_SLAVE(1, SIG_USER1)
-PROC_TEST_SLAVE(2, SIG_USER2)
-PROC_TEST_SLAVE(3, SIG_USER3)
-PROC_TEST_SLAVE(4, SIG_TIMEOUT)
-PROC_TEST_SLAVE(5, SIG_SYSTEM5)
-PROC_TEST_SLAVE(6, SIG_SYSTEM6)
-PROC_TEST_SLAVE(7, SIG_SINGLE)
+#define PROC_TEST_SLAVE_INIT(index, master_process) proc_new(proc_signalTest##index, master_process, KERN_MINSTACKSIZE * 2, NULL)
+
+#else
+
+#define PROC_TEST_SLAVE_STACK(index) PROC_DEFINE_STACK(proc_signal_test##index##_stack, KERN_MINSTACKSIZE * 2);
+#define PROC_TEST_SLAVE_INIT(index, master_process) proc_new(proc_signalTest##index, master_process, sizeof(proc_signal_test##index##_stack), proc_signal_test##index##_stack)
 
 PROC_TEST_SLAVE_STACK(0)
 PROC_TEST_SLAVE_STACK(1)
@@ -106,6 +111,18 @@ PROC_TEST_SLAVE_STACK(5)
 PROC_TEST_SLAVE_STACK(6)
 PROC_TEST_SLAVE_STACK(7)
 
+#endif
+
+// Generate the code for signal test.
+PROC_TEST_SLAVE(0, SIG_USER0)
+PROC_TEST_SLAVE(1, SIG_USER1)
+PROC_TEST_SLAVE(2, SIG_USER2)
+PROC_TEST_SLAVE(3, SIG_USER3)
+PROC_TEST_SLAVE(4, SIG_TIMEOUT)
+PROC_TEST_SLAVE(5, SIG_SYSTEM5)
+PROC_TEST_SLAVE(6, SIG_SYSTEM6)
+PROC_TEST_SLAVE(7, SIG_SINGLE)
+
 /**
  * Run signal test
  */
@@ -139,13 +156,13 @@ int signal_testRun(void)
 	MAIN_CHECK_SIGNAL(5, slave_5);
 	MAIN_CHECK_SIGNAL(6, slave_6);
 	MAIN_CHECK_SIGNAL(7, slave_7);
-	
+
 	if(count == countof(test_signal))
 	{
 		kprintf("Signal test finished..ok!\n");
 		return 0;
 	}
-	
+
 	kprintf("Signal test finished..fail!\n");
 	return -1;
 }
@@ -154,16 +171,10 @@ int signal_testSetup(void)
 {
 	kdbg_init();
 
-	#if CONFIG_KERN_PREEMPT
-		kprintf("Init Interrupt (preempt mode)..");
-		irq_init();
-		kprintf("Done.\n");
-	#endif
-
 	kprintf("Init Timer..");
 	timer_init();
 	kprintf("Done.\n");
-	
+
 	kprintf("Init Process..");
 	proc_init();
 	kprintf("Done.\n");
@@ -176,4 +187,4 @@ int signal_testTearDown(void)
 	return 0;
 }
 
-TEST_MAIN(signal);
\ No newline at end of file
+TEST_MAIN(signal);