From: richardbarry Date: Mon, 22 Nov 2010 16:11:16 +0000 (+0000) Subject: Remove the 'death' tasks from the demo as on Win2K and WinXP the behaviour of the... X-Git-Tag: V6.1.1~93 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=62601987e1c805aeb071bf0ab3cc81945a089388;p=freertos Remove the 'death' tasks from the demo as on Win2K and WinXP the behaviour of the TerminateThread() function is such that resources leak and eventually the 'death' tests will fail. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1164 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/WIN32-MingW/CreateProjectDirectoryStructure.bat b/Demo/WIN32-MingW/CreateProjectDirectoryStructure.bat index 26a75fa86..a1986dc04 100644 --- a/Demo/WIN32-MingW/CreateProjectDirectoryStructure.bat +++ b/Demo/WIN32-MingW/CreateProjectDirectoryStructure.bat @@ -43,7 +43,6 @@ IF EXIST FreeRTOS Goto END copy ..\Common\include\QPeek.h DemoTasks\include copy ..\Common\include\flop.h DemoTasks\include copy ..\Common\include\recmutex.h DemoTasks\include - copy ..\Common\include\death.h DemoTasks\include copy ..\Common\Minimal\BlockQ.c DemoTasks copy ..\Common\Minimal\integer.c DemoTasks copy ..\Common\Minimal\semtest.c DemoTasks @@ -51,6 +50,5 @@ IF EXIST FreeRTOS Goto END copy ..\Common\Minimal\GenQTest.c DemoTasks copy ..\Common\Minimal\QPeek.c DemoTasks copy ..\Common\Minimal\flop.c DemoTasks - copy ..\Common\Minimal\death.c DemoTasks : END \ No newline at end of file diff --git a/Demo/WIN32-MingW/FreeRTOSConfig.h b/Demo/WIN32-MingW/FreeRTOSConfig.h index 9ca238bba..c271c1036 100644 --- a/Demo/WIN32-MingW/FreeRTOSConfig.h +++ b/Demo/WIN32-MingW/FreeRTOSConfig.h @@ -69,7 +69,7 @@ #define configUSE_IDLE_HOOK 1 #define configUSE_TICK_HOOK 0 #define configTICK_RATE_HZ ( 50 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */ -#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 50 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */ +#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 20 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */ #define configTOTAL_HEAP_SIZE ( ( size_t ) 0 ) /* This parameter has no effect when heap_3.c is included in the project. */ #define configMAX_TASK_NAME_LEN ( 12 ) #define configUSE_TRACE_FACILITY 1 diff --git a/Demo/WIN32-MingW/main.c b/Demo/WIN32-MingW/main.c index d8eb1a0d0..bbcc0b691 100644 --- a/Demo/WIN32-MingW/main.c +++ b/Demo/WIN32-MingW/main.c @@ -96,7 +96,6 @@ #include "QPeek.h" #include "recmutex.h" #include "flop.h" -#include "death.h" /* Priorities at which the tasks are created. */ #define mainCHECK_TASK_PRIORITY ( configMAX_PRIORITIES - 1 ) @@ -130,11 +129,6 @@ int main( void ) vStartMathTasks( mainFLOP_TASK_PRIORITY ); vStartRecursiveMutexTasks(); - /* The suicide tasks must be created last as they need to know how many - tasks were running prior to their creation in order to ascertain whether - or not the correct/expected number of tasks are running at any given time. */ - vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); - /* Start the scheduler itself. */ vTaskStartScheduler(); @@ -190,10 +184,6 @@ char *pcStatusMessage = "OK"; { pcStatusMessage = "Error: Flop"; } - else if( xIsCreateTaskStillRunning() != pdPASS ) - { - pcStatusMessage = "Error: Create"; - } else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE ) { pcStatusMessage = "Error: RecMutex";