zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9309 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
Giovanni Di Sirio 2016-04-17 14:47:52 +00:00
parent 30f7b5e868
commit f7ef558614
6 changed files with 32 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demos/STM32/RT-STM32F303-DISCOVERY/main.c
View File

@ -21,8 +21,8 @@
/* /*
* Blinker thread #1. * Blinker thread #1.
*/ */
static THD_WORKING_AREA(waThread1, 128); THD_WORKING_AREA(waThread1, 128);
static THD_FUNCTION(Thread1, arg) { THD_FUNCTION(Thread1, arg) {
(void)arg; (void)arg;
@ -50,8 +50,8 @@ static THD_FUNCTION(Thread1, arg) {
/* /*
* Blinker thread #2. * Blinker thread #2.
*/ */
static THD_WORKING_AREA(waThread2, 128); THD_WORKING_AREA(waThread2, 128);
static THD_FUNCTION(Thread2, arg) { THD_FUNCTION(Thread2, arg) {
(void)arg; (void)arg;

40
test/rt/configuration.xml
View File

@ -60,23 +60,10 @@
/* /*
* Working Area size of test threads. * Working Area size of test threads.
*/ */
#define WA_SIZE THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE) #define WA_SIZE MEM_ALIGN_NEXT(THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE), \
PORT_WORKING_AREA_ALIGN)
/* extern uint8_t test_buffer[WA_SIZE * 5];
* Union of all Working Areas, usable as a single large buffer if required.
*/
union test_buffers {
struct {
THD_WORKING_AREA(T0, THREADS_STACK_SIZE);
THD_WORKING_AREA(T1, THREADS_STACK_SIZE);
THD_WORKING_AREA(T2, THREADS_STACK_SIZE);
THD_WORKING_AREA(T3, THREADS_STACK_SIZE);
THD_WORKING_AREA(T4, THREADS_STACK_SIZE);
} wa;
uint8_t buffer[WA_SIZE * 5];
};
extern union test_buffers test;
extern thread_t *threads[MAX_THREADS]; extern thread_t *threads[MAX_THREADS];
extern void * ROMCONST wa[5]; extern void * ROMCONST wa[5];
@ -86,10 +73,9 @@ systime_t test_wait_tick(void);]]></value>
</global_definitions> </global_definitions>
<global_code> <global_code>
<value><![CDATA[/* <value><![CDATA[/*
* Static working areas, the following areas can be used for threads or * Global test buffer holding 5 working areas.
* used as temporary buffers.
*/ */
union test_buffers test; ALIGNED_VAR(PORT_WORKING_AREA_ALIGN) uint8_t test_buffer[WA_SIZE * 5];
/* /*
* Pointers to the spawned threads. * Pointers to the spawned threads.
@ -99,8 +85,11 @@ thread_t *threads[MAX_THREADS];
/* /*
* Pointers to the working areas. * Pointers to the working areas.
*/ */
void * ROMCONST wa[5] = {test.wa.T0, test.wa.T1, test.wa.T2, void * ROMCONST wa[5] = {test_buffer + (WA_SIZE * 0),
test.wa.T3, test.wa.T4}; test_buffer + (WA_SIZE * 1),
test_buffer + (WA_SIZE * 2),
test_buffer + (WA_SIZE * 3),
test_buffer + (WA_SIZE * 4)};
/* /*
* Sets a termination request in all the test-spawned threads. * Sets a termination request in all the test-spawned threads.
@ -3575,8 +3564,7 @@ test_assert(chPoolAlloc(&mp1) == NULL, "provider returned memory");]]></value>
<value><![CDATA[#define ALLOC_SIZE 16 <value><![CDATA[#define ALLOC_SIZE 16
#define HEAP_SIZE (ALLOC_SIZE * 8) #define HEAP_SIZE (ALLOC_SIZE * 8)
static memory_heap_t test_heap; memory_heap_t test_heap;]]></value>
static CH_HEAP_AREA(myheap, HEAP_SIZE);]]></value>
</shared_code> </shared_code>
<cases> <cases>
<case> <case>
@ -3591,7 +3579,7 @@ static CH_HEAP_AREA(myheap, HEAP_SIZE);]]></value>
</condition> </condition>
<various_code> <various_code>
<setup_code> <setup_code>
<value><![CDATA[chHeapObjectInit(&test_heap, myheap, sizeof(myheap));]]></value> <value><![CDATA[chHeapObjectInit(&test_heap, test_buffer, sizeof(test_buffer));]]></value>
</setup_code> </setup_code>
<teardown_code> <teardown_code>
<value /> <value />
@ -3621,7 +3609,7 @@ size_t n, sz;]]></value>
<value /> <value />
</tags> </tags>
<code> <code>
<value><![CDATA[p1 = chHeapAlloc(&test_heap, HEAP_SIZE * 2); <value><![CDATA[p1 = chHeapAlloc(&test_heap, sizeof test_buffer * 2);
test_assert(p1 == NULL, "allocation not failed");]]></value> test_assert(p1 == NULL, "allocation not failed");]]></value>
</code> </code>
</step> </step>
@ -3850,7 +3838,7 @@ The test expects the first two threads to successfully start and the third one t
</condition> </condition>
<various_code> <various_code>
<setup_code> <setup_code>
<value><![CDATA[chHeapObjectInit(&heap1, test.buffer, sizeof(union test_buffers));]]></value> <value><![CDATA[chHeapObjectInit(&heap1, test_buffer, sizeof test_buffer);]]></value>
</setup_code> </setup_code>
<teardown_code> <teardown_code>
<value /> <value />

12
test/rt/source/test/test_root.c
View File

@ -91,10 +91,9 @@ const testcase_t * const *test_suite[] = {
/*===========================================================================*/ /*===========================================================================*/
/* /*
* Static working areas, the following areas can be used for threads or * Global test buffer holding 5 working areas.
* used as temporary buffers.
*/ */
union test_buffers test; ALIGNED_VAR(PORT_WORKING_AREA_ALIGN) uint8_t test_buffer[WA_SIZE * 5];
/* /*
* Pointers to the spawned threads. * Pointers to the spawned threads.
@ -104,8 +103,11 @@ thread_t *threads[MAX_THREADS];
/* /*
* Pointers to the working areas. * Pointers to the working areas.
*/ */
void * ROMCONST wa[5] = {test.wa.T0, test.wa.T1, test.wa.T2, void * ROMCONST wa[5] = {test_buffer + (WA_SIZE * 0),
test.wa.T3, test.wa.T4}; test_buffer + (WA_SIZE * 1),
test_buffer + (WA_SIZE * 2),
test_buffer + (WA_SIZE * 3),
test_buffer + (WA_SIZE * 4)};
/* /*
* Sets a termination request in all the test-spawned threads. * Sets a termination request in all the test-spawned threads.

19
test/rt/source/test/test_root.h
View File

@ -82,23 +82,10 @@ extern "C" {
/* /*
* Working Area size of test threads. * Working Area size of test threads.
*/ */
#define WA_SIZE THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE) #define WA_SIZE MEM_ALIGN_NEXT(THD_WORKING_AREA_SIZE(THREADS_STACK_SIZE), \
PORT_WORKING_AREA_ALIGN)
/* extern uint8_t test_buffer[WA_SIZE * 5];
* Union of all Working Areas, usable as a single large buffer if required.
*/
union test_buffers {
struct {
THD_WORKING_AREA(T0, THREADS_STACK_SIZE);
THD_WORKING_AREA(T1, THREADS_STACK_SIZE);
THD_WORKING_AREA(T2, THREADS_STACK_SIZE);
THD_WORKING_AREA(T3, THREADS_STACK_SIZE);
THD_WORKING_AREA(T4, THREADS_STACK_SIZE);
} wa;
uint8_t buffer[WA_SIZE * 5];
};
extern union test_buffers test;
extern thread_t *threads[MAX_THREADS]; extern thread_t *threads[MAX_THREADS];
extern void * ROMCONST wa[5]; extern void * ROMCONST wa[5];

7
test/rt/source/test/test_sequence_010.c
View File

@ -51,8 +51,7 @@
#define ALLOC_SIZE 16 #define ALLOC_SIZE 16
#define HEAP_SIZE (ALLOC_SIZE * 8) #define HEAP_SIZE (ALLOC_SIZE * 8)
static memory_heap_t test_heap; memory_heap_t test_heap;
static CH_HEAP_AREA(myheap, HEAP_SIZE);
/**************************************************************************** /****************************************************************************
* Test cases. * Test cases.
@ -89,7 +88,7 @@ static CH_HEAP_AREA(myheap, HEAP_SIZE);
*/ */
static void test_010_001_setup(void) { static void test_010_001_setup(void) {
chHeapObjectInit(&test_heap, myheap, sizeof(myheap)); chHeapObjectInit(&test_heap, test_buffer, sizeof(test_buffer));
} }
static void test_010_001_execute(void) { static void test_010_001_execute(void) {
@ -107,7 +106,7 @@ static void test_010_001_execute(void) {
an error is expected.*/ an error is expected.*/
test_set_step(2); test_set_step(2);
{ {
p1 = chHeapAlloc(&test_heap, HEAP_SIZE * 2); p1 = chHeapAlloc(&test_heap, sizeof test_buffer * 2);
test_assert(p1 == NULL, "allocation not failed"); test_assert(p1 == NULL, "allocation not failed");
} }

2
test/rt/source/test/test_sequence_011.c
View File

@ -93,7 +93,7 @@ static THD_FUNCTION(dyn_thread1, p) {
*/ */
static void test_011_001_setup(void) { static void test_011_001_setup(void) {
chHeapObjectInit(&heap1, test.buffer, sizeof(union test_buffers)); chHeapObjectInit(&heap1, test_buffer, sizeof test_buffer);
} }
static void test_011_001_execute(void) { static void test_011_001_execute(void) {