X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_test.c;h=a32d667e966edf9452013d596a5a693605527286;hb=ecc3d927e252b3fa278b5320f16364fc14d61220;hp=4c2f3126d76feea80fea461fa709c70defb6d97b;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/kern/proc_test.c b/bertos/kern/proc_test.c
index 4c2f3126..a32d667e 100644
--- a/bertos/kern/proc_test.c
+++ b/bertos/kern/proc_test.c
@@ -1,58 +1,127 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
+ * -->
+ *
+ *
+ * \brief Test kernel process.
+ *
+ * \version $Id$
+ *
+ * \author Daniele Basile <asterix@develer.com>
+ */
 
 #include <kern/proc.h>
 #include <drv/timer.h>
+#include <cfg/test.h>
 
-/**
+/*
  * Proc scheduling test subthread 1
  */
-static void NORETURN proc_test_thread1(void)
+static void proc_test1(void)
 {
-	for (;;)
+	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">task 1\n");
+		kputs("> test1\n");
 		timer_delay(50);
-		proc_switch();
+		proc_yield();
 	}
 }
 
-/**
+/*
  * Proc scheduling test subthread 2
  */
-static void NORETURN proc_test_thread2(void)
+static void proc_test2(void)
 {
-	for (;;)
+	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">task 2\n");
+		kputs("> test2\n");
 		timer_delay(75);
-		proc_switch();
 	}
 }
 
-static cpustack_t proc_test_stack1[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
-static cpustack_t proc_test_stack2[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
+static cpustack_t proc_test1_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
+static cpustack_t proc_test2_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
+
+
+int proc_testSetup(void)
+{
+	kdbg_init();
+	proc_init();
+	IRQ_ENABLE;
+	timer_init();
+	return 0;
+}
+
+int proc_testTearDown(void)
+{
+	return 0;
+}
 
 /**
- * Proc scheduling test
+ * Process scheduling test
  */
-void NORETURN proc_test(void)
+int proc_testRun(void)
 {
-	proc_new(proc_test_thread1, NULL, sizeof(proc_test_stack1), proc_test_stack1);
-	proc_new(proc_test_thread2, NULL, sizeof(proc_test_stack2), proc_test_stack2);
-	kputs("Created tasks\n");
-
-	kputs("stack1:\n");
-//	#warning FIXME
-	kdump(proc_test_stack1+sizeof(proc_test_stack1)-64, 64);
-	kputs("stack2:\n");
-//	#warning FIXME
-	kdump(proc_test_stack2+sizeof(proc_test_stack1)-64, 64);
-
-	for (;;)
+	proc_new(proc_test1, NULL, sizeof(proc_test1_stack), proc_test1_stack);
+	proc_new(proc_test2, NULL, sizeof(proc_test2_stack), proc_test2_stack);
+	kputs("Processes created\n");
+
+	//kputs("stack1:\n");
+	//kdump(proc_test_stack1 + sizeof(proc_test_stack1) - 64, 64);
+
+	//kputs("stack2:\n");
+	//kdump(proc_test_stack2 + sizeof(proc_test_stack2) - 64, 64);
+
+	for (int i = 0; i < 30; ++i)
 	{
-		kputs(">main task\n");
+		kputs("> main\n");
 		timer_delay(93);
-		proc_switch();
+		proc_yield();
 	}
-
-	ASSERT(false);
+	return 0;
 }
+#warning Fix test to comply to new policy.
+#if 0
+/*
+ * FIXME: to be compiled as a single file 
+ * the kernel module needs the assembly switch function
+ * and the idle() that lay in a emulator cpp file.
+ * How can we fix this?
+ */
+#include TEST_ONLY(drv/kdebug.c)
+#include TEST_ONLY(kern/coop.c)
+#include TEST_ONLY(kern/proc.c)
+#include TEST_ONLY(drv/timer.c)
+#include TEST_ONLY(mware/formatwr.c)
+#include TEST_ONLY(mware/hex.c)
+#include TEST_ONLY(os/hptime.c)
+
+TEST_MAIN(proc);
+#endif