Update task pool so tasks and timer are allocated statically.

git-svn-id: http://svn.code.sf.net/p/freertos/code/trunk@2695 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

3 files changed, 36 insertions, 52 deletions

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/include/private/iot_taskpool_internal.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/include/private/iot_taskpool_internal.h
index b989c586c..3779ff958 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/include/private/iot_taskpool_internal.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/include/private/iot_taskpool_internal.h
@@ -255,7 +255,6 @@ typedef struct _taskPool
     int32_t priority;                        /**< @brief The priority for all task pool threads. */

     SemaphoreHandle_t dispatchSignal;        /**< @brief The synchronization object on which threads are waiting for incoming jobs. */

     StaticSemaphore_t dispatchSignalBuffer;  /**< @brief The semaphore buffer. */

-    SemaphoreHandle_t startStopSignal;       /**< @brief The synchronization object for threads to signal start and stop condition. */

     StaticSemaphore_t startStopSignalBuffer; /**< @brief The semaphore buffer. */

     TimerHandle_t timer;                     /**< @brief The timer for deferred jobs. */

     StaticTimer_t timerBuffer;               /**< @brief The timer buffer. */

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/include/types/iot_taskpool_types.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/include/types/iot_taskpool_types.h
index 96485fddf..ce80167c2 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/include/types/iot_taskpool_types.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/include/types/iot_taskpool_types.h
@@ -235,12 +235,12 @@ typedef struct IotTaskPoolJobStorage
 /**

  * @ingroup taskpool_datatypes_handles

  * @brief Opaque handle of a Task Pool Job.

- * 

+ *

  * This type identifies a Task Pool Job instance, which is valid after a successful call

  * to @ref taskpool_function_createjob or @ref taskpool_function_createrecyclablejob.

  *

- * A call to @ref taskpool_function_recyclejob or @ref taskpool_function_destroyrecyclablejob makes a 

- * task pool job handle invalid. Once @ref taskpool_function_recyclejob or 

+ * A call to @ref taskpool_function_recyclejob or @ref taskpool_function_destroyrecyclablejob makes a

+ * task pool job handle invalid. Once @ref taskpool_function_recyclejob or

  * @ref taskpool_function_destroyrecyclablejob returns, the task job handle should no longer be used.

  *

  * @initializer{IotTaskPoolJob_t,IOT_TASKPOOL_JOB_INITIALIZER}

@@ -325,21 +325,21 @@ typedef struct IotTaskPoolInfo
  */

 /* @[define_taskpool_initializers] */

 /** @brief Initializer for a small #IotTaskPoolInfo_t. */

-#define IOT_TASKPOOL_INFO_INITIALIZER_SMALL     { .minThreads = 1, .maxThreads = 1, .stackSize = IOT_THREAD_DEFAULT_STACK_SIZE, .priority = IOT_THREAD_DEFAULT_PRIORITY } 

+#define IOT_TASKPOOL_INFO_INITIALIZER_SMALL     { .minThreads = 1, .maxThreads = 1, .stackSize = IOT_THREAD_DEFAULT_STACK_SIZE, .priority = IOT_THREAD_DEFAULT_PRIORITY }

 /** @brief Initializer for a medium #IotTaskPoolInfo_t. */

-#define IOT_TASKPOOL_INFO_INITIALIZER_MEDIUM    { .minThreads = 1, .maxThreads = 2, .stackSize = IOT_THREAD_DEFAULT_STACK_SIZE, .priority = IOT_THREAD_DEFAULT_PRIORITY } 

+#define IOT_TASKPOOL_INFO_INITIALIZER_MEDIUM    { .minThreads = 1, .maxThreads = 2, .stackSize = IOT_THREAD_DEFAULT_STACK_SIZE, .priority = IOT_THREAD_DEFAULT_PRIORITY }

 /** @brief Initializer for a large #IotTaskPoolInfo_t. */

-#define IOT_TASKPOOL_INFO_INITIALIZER_LARGE     { .minThreads = 2, .maxThreads = 3, .stackSize = IOT_THREAD_DEFAULT_STACK_SIZE, .priority = IOT_THREAD_DEFAULT_PRIORITY } 

+#define IOT_TASKPOOL_INFO_INITIALIZER_LARGE     { .minThreads = 2, .maxThreads = 3, .stackSize = IOT_THREAD_DEFAULT_STACK_SIZE, .priority = IOT_THREAD_DEFAULT_PRIORITY }

 /** @brief Initializer for a very large #IotTaskPoolInfo_t. */

-#define IOT_TASKPOOL_INFO_INITIALIZER_XLARGE    { .minThreads = 2, .maxThreads = 4, .stackSize = IOT_THREAD_DEFAULT_STACK_SIZE, .priority = IOT_THREAD_DEFAULT_PRIORITY } 

+#define IOT_TASKPOOL_INFO_INITIALIZER_XLARGE    { .minThreads = 2, .maxThreads = 4, .stackSize = IOT_THREAD_DEFAULT_STACK_SIZE, .priority = IOT_THREAD_DEFAULT_PRIORITY }

 /** @brief Initializer for a typical #IotTaskPoolInfo_t. */

 #define IOT_TASKPOOL_INFO_INITIALIZER           IOT_TASKPOOL_INFO_INITIALIZER_MEDIUM

 /** @brief Initializer for a #IotTaskPool_t. */

-#define IOT_TASKPOOL_INITIALIZER                NULL           

+#define IOT_TASKPOOL_INITIALIZER                NULL

 /** @brief Initializer for a #IotTaskPoolJobStorage_t. */

-#define IOT_TASKPOOL_JOB_STORAGE_INITIALIZER    { { NULL, NULL }, NULL, NULL, 0, IOT_TASKPOOL_STATUS_UNDEFINED }              

+#define IOT_TASKPOOL_JOB_STORAGE_INITIALIZER    { { NULL, NULL }, NULL, NULL, 0, IOT_TASKPOOL_STATUS_UNDEFINED }

 /** @brief Initializer for a #IotTaskPoolJob_t. */

-#define IOT_TASKPOOL_JOB_INITIALIZER            NULL                                                                                                                    

+#define IOT_TASKPOOL_JOB_INITIALIZER            NULL

 /* @[define_taskpool_initializers] */

 

 /**

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/taskpool/iot_taskpool.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/taskpool/iot_taskpool.c
index 2144ba5d8..6f90c19af 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/taskpool/iot_taskpool.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-IoT-SDK/c_sdk/standard/common/taskpool/iot_taskpool.c
@@ -42,7 +42,7 @@
 #include <string.h>

 

 #if !defined( configSUPPORT_STATIC_ALLOCATION ) || ( configSUPPORT_STATIC_ALLOCATION != 1 )

-	#error configSUPPORT_STATIC_ALLOCATION must be set to 1 in FreeRTOSConfig.h to build this file.

+    #error configSUPPORT_STATIC_ALLOCATION must be set to 1 in FreeRTOSConfig.h to build this file.

 #endif

 

 /* Task pool internal include. */

@@ -653,8 +653,16 @@ static IotTaskPoolError_t _createTaskPool( const IotTaskPoolInfo_t * const pInfo
 {

     TASKPOOL_FUNCTION_ENTRY( IOT_TASKPOOL_SUCCESS );

 

+    /* Static TCB structures and arrays to be used by statically allocated

+    worker tasks. */

+    static StaticTask_t workerTaskTCBs[ IOT_TASKPOOL_NUMBER_OF_WORKERS ];

+    static StackType_t workerTaskStacks[ IOT_TASKPOOL_NUMBER_OF_WORKERS ][ IOT_TASKPOOL_WORKER_STACK_SIZE_BYTES / sizeof( portSTACK_TYPE ) ];

+

+	/* Static structure to hold te software timer. */

+	static StaticTimer_t staticTimer;

+

     uint32_t threadsCreated = 0; /* Although initialised before use removing the initialiser here results in compiler warnings. */

-    char cTaskName[ 10 ];

+    char taskName[ 10 ];

 

     /* Check input values for consistency. */

     TASKPOOL_ON_NULL_ARG_GOTO_CLEANUP( pTaskPool );

@@ -666,14 +674,12 @@ static IotTaskPoolError_t _createTaskPool( const IotTaskPoolInfo_t * const pInfo
     _initTaskPoolControlStructures( pTaskPool );

 

     /* Create the timer for a new connection. */

-    pTaskPool->timer = xTimerCreate( NULL, portMAX_DELAY, pdFALSE, ( void * ) pTaskPool, _timerCallback );

-

-    if( pTaskPool->timer == NULL )

-    {

-        IotLogError( "Failed to create timer for task pool." );

-

-        TASKPOOL_SET_AND_GOTO_CLEANUP( IOT_TASKPOOL_NO_MEMORY );

-    }

+    pTaskPool->timer = xTimerCreateStatic( NULL, /* Text name for the timer, only used for debugging. */

+		                                   portMAX_DELAY, /* Timer period in ticks. */

+		                                   pdFALSE, /* pdFALSE means its a one-shot timer. */

+		                                  ( void * ) pTaskPool, /* Parameter passed into callback. */

+		                                  _timerCallback, /* Callback that executes when the timer expires. */

+		                                  &staticTimer ); /* Static storage for the timer's data structure. */

 

     /* The task pool will initialize the minimum number of threads requested by the user upon start.

     Note this tailored version of the task pool does not autoscale, but fixes the number of tasks

@@ -681,46 +687,25 @@ static IotTaskPoolError_t _createTaskPool( const IotTaskPoolInfo_t * const pInfo
     /* Create the minimum number of threads specified by the user, and if one fails shutdown and return error. */

     for( threadsCreated = 0; threadsCreated < pInfo->minThreads; )

     {

-        TaskHandle_t task = NULL;

-

         /* Generate a unique name for the task. */

-        snprintf( cTaskName, sizeof( cTaskName ), "pool%d", ( int ) threadsCreated );

-

-        BaseType_t res = xTaskCreate( _taskPoolWorker,

-                                      cTaskName,

-                                      pInfo->stackSize / sizeof( portSTACK_TYPE ), /* xTaskCreate() expects the stack size to be specified in words. */

-                                      pTaskPool,

-                                      pInfo->priority,

-                                      &task );

+        snprintf( taskName, sizeof( taskName ), "pool%d", ( int ) threadsCreated );

 

-        /* Create one thread. */

-        if( res == pdFALSE ) //_RB_ would not be needed if tasks are created statically.

-        {

-            IotLogError( "Could not create worker thread! Exiting..." );

+        xTaskCreateStatic( _taskPoolWorker, /* Function that implements the task. */

+                           taskName,       /* Text name for the task, used for debugging only. */

+			               IOT_TASKPOOL_WORKER_STACK_SIZE_BYTES / sizeof( portSTACK_TYPE ), /* xTaskCreate() expects the stack size to be specified in words. */

+                           pTaskPool,       /* Parameter passed into the task. */

+                           pInfo->priority, /* Priority at which the task starts running. */

+                           &( workerTaskStacks[ threadsCreated ][ 0 ] ), /* Pointer to static storage for the task's stack. */

+						   &( workerTaskTCBs[ threadsCreated ] ) ); /* Pointer to static storage for te task's TCB. */

 

-            /* If creating one thread fails, set error condition and exit the loop. */

-            TASKPOOL_SET_AND_GOTO_CLEANUP( IOT_TASKPOOL_NO_MEMORY );

-        }

-

-        /* Upon successful thread creation, increase the number of active threads. */

+		/* Upon successful thread creation, increase the number of active threads. */

         pTaskPool->activeThreads++;

-        IotTaskPool_Assert( task != NULL );

-

         ++threadsCreated;

     }

+	pTaskPool->running = true;

 

     TASKPOOL_FUNCTION_CLEANUP();

 

-    /* In case of failure, wait on the created threads to exit. */

-    if( TASKPOOL_FAILED( status ) )

-    {

-        /* Set the exit condition for the newly created threads. */

-#pragma message( "Threads need to be created statically here to ensure creation cannot fail as there is no shutdown mechanism." )

-        _destroyTaskPool( pTaskPool );

-    }

-

-    pTaskPool->running = true;

-

     TASKPOOL_FUNCTION_CLEANUP_END();

 }