Merge branch "preempt" in "trunk".
[bertos.git] / bertos / kern / sem_test.c
index b5a1da375f88a5c4e258d15e96c637d659bef18d..555f755d1562076e5dd857e304c403874f010bba 100644 (file)
  * \brief Semaphore test.
  *
  * \version $Id$
- * 
+ *
  * \author Daniele Basile <asterix@develer.com>
- * \author Stefano Fedrigo <aleph@develer.com> 
- * 
+ * \author Stefano Fedrigo <aleph@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_sem.h $cfgdir/
+ * $test$: echo  "#undef CONFIG_KERN_SEMAPHORES" >> $cfgdir/cfg_sem.h
+ * $test$: echo "#define CONFIG_KERN_SEMAPHORES 1" >> $cfgdir/cfg_sem.h
  */
 
+#include <cfg/debug.h>
 #include <cfg/test.h>
 
 #include <kern/sem.h>
 #include <drv/timer.h>
 
 // Global settings for the test.
-#define MAX_GLOBAL_COUNT               10
-#define TEST_TIME_OUT_MS             1000
-#define DELAY                          10
+#define MAX_GLOBAL_COUNT             1024
+#define TEST_TIME_OUT_MS             6000
+#define DELAY                           5
+
+// Settings for the test process.
+//Process 1
 #define INC_PROC_T1                     1
 #define DELAY_PROC_T1   INC_PROC_T1*DELAY
+//Process 2
 #define INC_PROC_T2                     3
 #define DELAY_PROC_T2   INC_PROC_T2*DELAY
+//Process 3
+#define INC_PROC_T3                     5
+#define DELAY_PROC_T3   INC_PROC_T3*DELAY
+//Process 4
+#define INC_PROC_T4                     7
+#define DELAY_PROC_T4   INC_PROC_T4*DELAY
+//Process 5
+#define INC_PROC_T5                    11
+#define DELAY_PROC_T5   INC_PROC_T5*DELAY
+//Process 6
+#define INC_PROC_T6                    13
+#define DELAY_PROC_T6   INC_PROC_T6*DELAY
+//Process 7
+#define INC_PROC_T7                    17
+#define DELAY_PROC_T7   INC_PROC_T7*DELAY
+//Process 8
+#define INC_PROC_T8                    19
+#define DELAY_PROC_T8   INC_PROC_T8*DELAY
 
 Semaphore sem;
 unsigned int global_count = 0;
 
 /*
- * Proc scheduling test subthread 1
- */
-static void proc_test1(void)
-{
-       unsigned int local_count = 0;
-       
-       for (int i = 0; i < INC_PROC_T1; ++i)
-       {
-               kputs("> test1\n");
-               sem_obtain(&sem);
-               kputs("> test1: Obtain semaphore.\n");
-               local_count = global_count;
-               kprintf("> test1: Read global count [%d]\n", local_count);
-               timer_delay(DELAY_PROC_T1);
-               local_count += INC_PROC_T1;
-               global_count = local_count;
-               kprintf("> test1: Update count g[%d] l[%d]\n", global_count, local_count);
-               sem_release(&sem);
-               kputs("> test1: Relase semaphore.\n");
-       }
-}
-
-/*
- * Proc scheduling test subthread 2
+ * These macros generate the code needed to create the test process functions.
  */
-static void proc_test2(void)
-{
-       unsigned int local_count = 0;
-       
-       for (int i = 0; i < INC_PROC_T2; ++i)
-       {
-               kputs("> test2\n");
-               sem_obtain(&sem);
-               kputs("> test2: Obtain semaphore.\n");
-               local_count = global_count;
-               kprintf("> test2: Read global count [%d]\n", local_count);
-               timer_delay(DELAY_PROC_T2);
-               local_count += INC_PROC_T2;
-               global_count = local_count;
-               kprintf("> test2: Update count g[%d] l[%d]\n", global_count, local_count);
-               sem_release(&sem);
-               kputs("> test2: Relase semaphore.\n");
-       }
-}
+#define PROC_TEST(num) static void proc_semTest##num(void) \
+{ \
+       unsigned int local_count = 0; \
+       \
+       for (int i = 0; i < INC_PROC_T##num; ++i) \
+       { \
+               sem_obtain(&sem); \
+               kprintf("> test%d: Obtain semaphore.\n", num); \
+               local_count = global_count; \
+               kprintf("> test%d: Read global count [%d]\n", num, local_count); \
+               timer_delay(DELAY_PROC_T##num); \
+               local_count += INC_PROC_T##num; \
+               global_count = local_count; \
+               kprintf("> test%d: Update count g[%d] l[%d]\n", num, global_count, local_count); \
+               sem_release(&sem); \
+               kprintf("> test%d: Relase semaphore.\n", num); \
+       } \
+} \
+
+#define PROC_TEST_STACK(num)  PROC_DEFINE_STACK(proc_sem_test##num##_stack, KERN_MINSTACKSIZE * 2)
+#define PROC_TEST_INIT(num)   proc_new(proc_semTest##num, NULL, sizeof(proc_sem_test##num##_stack), proc_sem_test##num##_stack);
+
+// Define process
+PROC_TEST(1)
+PROC_TEST(2)
+PROC_TEST(3)
+PROC_TEST(4)
+PROC_TEST(5)
+PROC_TEST(6)
+PROC_TEST(7)
+PROC_TEST(8)
 
 // Define process stacks for test.
-static cpu_stack_t proc_test1_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpu_stack_t)];
-static cpu_stack_t proc_test2_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpu_stack_t)];
-
+PROC_TEST_STACK(1)
+PROC_TEST_STACK(2)
+PROC_TEST_STACK(3)
+PROC_TEST_STACK(4)
+PROC_TEST_STACK(5)
+PROC_TEST_STACK(6)
+PROC_TEST_STACK(7)
+PROC_TEST_STACK(8)
 
 /**
  * Run semaphore test
@@ -117,20 +140,27 @@ int sem_testRun(void)
        ticks_t start_time = timer_clock();
 
        kprintf("Run semaphore test..\n");
-       
-       proc_new(proc_test1, NULL, sizeof(proc_test1_stack), proc_test1_stack);
-       proc_new(proc_test2, NULL, sizeof(proc_test2_stack), proc_test2_stack);
+
+       //Init the process tests
+       PROC_TEST_INIT(1)
+       PROC_TEST_INIT(2)
+       PROC_TEST_INIT(3)
+       PROC_TEST_INIT(4)
+       PROC_TEST_INIT(5)
+       PROC_TEST_INIT(6)
+       PROC_TEST_INIT(7)
+       PROC_TEST_INIT(8)
        kputs("> Main: Processes created\n");
-       
+
        /*
-        * Wait until all process finishing, if some going wrong we return 
-        * error after time_out_ms ms.
-        */ 
+        * Wait until all processes exit, if something goes wrong we return an
+        * error after timeout_ms.
+        */
        while((timer_clock() - start_time) < ms_to_ticks(TEST_TIME_OUT_MS))
        {
                if (sem_attempt(&sem))
                {
-                       kputs("> Main: Check if test is finish..\n");
+                       kputs("> Main: Check if test has finished..\n");
                        if(global_count == MAX_GLOBAL_COUNT)
                        {
                                kputs("> Main: Test Finished..Ok!\n");
@@ -141,7 +171,7 @@ int sem_testRun(void)
                }
                proc_yield();
        }
-       
+
        kputs("Semaphore Test fail..\n");
        return -1;
 }
@@ -153,21 +183,15 @@ int sem_testSetup(void)
        kprintf("Init Semaphore..");
        sem_init(&sem);
        kprintf("Done.\n");
-       
-       #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");
-       
+
        return 0;
 }
 
@@ -177,4 +201,4 @@ int sem_testTearDown(void)
        return 0;
 }
 
-TEST_MAIN(sem);
\ No newline at end of file
+TEST_MAIN(sem);