mirror of
https://github.com/FreeRTOS/FreeRTOS.git
synced 2025-06-23 01:21:42 +08:00
Remove the simple UDP client/server tasks from the MQTT demo as the demo's network connection can be tested more easily just by pinging it.
Tidy up the iot_config.h header files a little.
This commit is contained in:
Richard Barry
@ -27,6 +27,35 @@
|
||||
* @brief Implements the task pool functions in iot_taskpool.h
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* The full IoT Task Pool Library has many use cases, including Linux
|
||||
* development. <20>Typical FreeRTOS use cases do not require the full
|
||||
* functionality so an optimised implementation is provided specifically for use
|
||||
* with FreeRTOS. The optimised version has a fixed number of tasks in the
|
||||
* pool, each of which uses statically allocated memory to ensure creation of
|
||||
* the pool is guaranteed (it does not run out of heap space). The constant
|
||||
* IOT_TASKPOOL_NUMBER_OF_WORKERS sets the number of tasks in the pool.
|
||||
*
|
||||
* Unlike the full version, this optimised version:
|
||||
* + Only supports a single task pool (system task pool) at a time.
|
||||
* + Does not auto-scale by dynamically adding more tasks if the number of
|
||||
* + tasks in the pool becomes exhausted. <20>The number of tasks in the pool
|
||||
* are fixed at compile time.<2E> See the task pool configuration options for
|
||||
* more information.
|
||||
* + Cannot be shut down - it exists for the lifetime of the application.
|
||||
*
|
||||
* As such this file does not implement the following API functions:
|
||||
* + IotTaskPool_GetSystemTaskPool()
|
||||
* + IotTaskPool_Create()
|
||||
* + IotTaskPool_Destroy()
|
||||
* + IotTaskPool_SetMaxThreads()
|
||||
*
|
||||
* Users who are interested in the functionality of the full IoT Task Pool
|
||||
* library can us it in place of this optimised version.
|
||||
*/
|
||||
|
||||
|
||||
/* Kernel includes. */
|
||||
#include "FreeRTOS.h"
|
||||
#include "semphr.h"
|
||||
@ -224,28 +253,6 @@ static IotTaskPoolError_t _tryCancelInternal( _taskPool_t * const pTaskPool,
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
||||
/*
|
||||
* The full IoT Task Pool Library has many use cases, including Linux
|
||||
* development. <20>Typical FreeRTOS use cases do not require the full
|
||||
* functionality so optimised version is provided specifically for use with
|
||||
* FreeRTOS. Unlike the full version, this optimised version:
|
||||
* + Only supports a single task pool (system task pool) at a time.
|
||||
* + Does not auto-scale by dynamically adding more tasks if the number of
|
||||
* + tasks in the pool becomes exhausted. <20>The number of tasks in the pool
|
||||
* are fixed at compile time.<2E> See the task pool configuration options for
|
||||
* more information.
|
||||
* + Cannot be shut down - it exists for the lifetime of the application.
|
||||
*
|
||||
* As such this file does not implement the following API functions:
|
||||
* + IotTaskPool_GetSystemTaskPool()
|
||||
* + IotTaskPool_Create()
|
||||
* + IotTaskPool_Destroy()
|
||||
* + IotTaskPool_SetMaxThreads()
|
||||
*
|
||||
* Users who are interested in the functionality of the full IoT Task Pool
|
||||
* library can us it in place of this optimised version.
|
||||
*/
|
||||
|
||||
IotTaskPoolError_t IotTaskPool_CreateSystemTaskPool( const IotTaskPoolInfo_t * const pInfo )
|
||||
{
|
||||
TASKPOOL_FUNCTION_ENTRY( IOT_TASKPOOL_SUCCESS );
|
||||
|
||||
@ -1,175 +0,0 @@
|
||||
/*
|
||||
* Amazon FreeRTOS Common V1.0.0
|
||||
* Copyright (C) 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* http://aws.amazon.com/freertos
|
||||
* http://www.FreeRTOS.org
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file iot_taskpool_static_memory.c
|
||||
* @brief Implementation of task pool static memory functions.
|
||||
*/
|
||||
|
||||
/* The config header is always included first. */
|
||||
#include "iot_config.h"
|
||||
|
||||
/* This file should only be compiled if dynamic memory allocation is forbidden. */
|
||||
#if IOT_STATIC_MEMORY_ONLY == 1
|
||||
|
||||
/* Standard includes. */
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
/* Static memory include. */
|
||||
#include "private/iot_static_memory.h"
|
||||
|
||||
/* Task pool internal include. */
|
||||
#include "private/iot_taskpool_internal.h"
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/* Validate static memory configuration settings. */
|
||||
#if IOT_TASKPOOL_JOBS_RECYCLE_LIMIT <= 0
|
||||
#error "IOT_TASKPOOL_JOBS_RECYCLE_LIMIT cannot be 0 or negative."
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* Static memory buffers and flags, allocated and zeroed at compile-time.
|
||||
*/
|
||||
static bool _pInUseTaskPools[ IOT_TASKPOOLS ] = { 0 }; /**< @brief Task pools in-use flags. */
|
||||
static _taskPool_t _pTaskPools[ IOT_TASKPOOLS ] = { { .dispatchQueue = IOT_DEQUEUE_INITIALIZER } }; /**< @brief Task pools. */
|
||||
|
||||
static bool _pInUseTaskPoolJobs[ IOT_TASKPOOL_JOBS_RECYCLE_LIMIT ] = { 0 }; /**< @brief Task pool jobs in-use flags. */
|
||||
static _taskPoolJob_t _pTaskPoolJobs[ IOT_TASKPOOL_JOBS_RECYCLE_LIMIT ] = { { .link = IOT_LINK_INITIALIZER } }; /**< @brief Task pool jobs. */
|
||||
|
||||
static bool _pInUseTaskPoolTimerEvents[ IOT_TASKPOOL_JOBS_RECYCLE_LIMIT ] = { 0 }; /**< @brief Task pool timer event in-use flags. */
|
||||
static _taskPoolTimerEvent_t _pTaskPoolTimerEvents[ IOT_TASKPOOL_JOBS_RECYCLE_LIMIT ] = { { .link = { 0 } } }; /**< @brief Task pool timer events. */
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
void * IotTaskPool_MallocTaskPool( size_t size )
|
||||
{
|
||||
int freeIndex = -1;
|
||||
void * pNewTaskPool = NULL;
|
||||
|
||||
/* Check size argument. */
|
||||
if( size == sizeof( _taskPool_t ) )
|
||||
{
|
||||
/* Find a free task pool job. */
|
||||
freeIndex = IotStaticMemory_FindFree( _pInUseTaskPools, IOT_TASKPOOLS );
|
||||
|
||||
if( freeIndex != -1 )
|
||||
{
|
||||
pNewTaskPool = &( _pTaskPools[ freeIndex ] );
|
||||
}
|
||||
}
|
||||
|
||||
return pNewTaskPool;
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
void IotTaskPool_FreeTaskPool( void * ptr )
|
||||
{
|
||||
/* Return the in-use task pool job. */
|
||||
IotStaticMemory_ReturnInUse( ptr,
|
||||
_pTaskPools,
|
||||
_pInUseTaskPools,
|
||||
IOT_TASKPOOLS,
|
||||
sizeof( _taskPool_t ) );
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
void * IotTaskPool_MallocJob( size_t size )
|
||||
{
|
||||
int32_t freeIndex = -1;
|
||||
void * pNewJob = NULL;
|
||||
|
||||
/* Check size argument. */
|
||||
if( size == sizeof( _taskPoolJob_t ) )
|
||||
{
|
||||
/* Find a free task pool job. */
|
||||
freeIndex = IotStaticMemory_FindFree( _pInUseTaskPoolJobs,
|
||||
IOT_TASKPOOL_JOBS_RECYCLE_LIMIT );
|
||||
|
||||
if( freeIndex != -1 )
|
||||
{
|
||||
pNewJob = &( _pTaskPoolJobs[ freeIndex ] );
|
||||
}
|
||||
}
|
||||
|
||||
return pNewJob;
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
void IotTaskPool_FreeJob( void * ptr )
|
||||
{
|
||||
/* Return the in-use task pool job. */
|
||||
IotStaticMemory_ReturnInUse( ptr,
|
||||
_pTaskPoolJobs,
|
||||
_pInUseTaskPoolJobs,
|
||||
IOT_TASKPOOL_JOBS_RECYCLE_LIMIT,
|
||||
sizeof( _taskPoolJob_t ) );
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
void * IotTaskPool_MallocTimerEvent( size_t size )
|
||||
{
|
||||
int32_t freeIndex = -1;
|
||||
void * pNewTimerEvent = NULL;
|
||||
|
||||
/* Check size argument. */
|
||||
if( size == sizeof( _taskPoolTimerEvent_t ) )
|
||||
{
|
||||
/* Find a free task pool timer event. */
|
||||
freeIndex = IotStaticMemory_FindFree( _pInUseTaskPoolTimerEvents,
|
||||
IOT_TASKPOOL_JOBS_RECYCLE_LIMIT );
|
||||
|
||||
if( freeIndex != -1 )
|
||||
{
|
||||
pNewTimerEvent = &( _pTaskPoolTimerEvents[ freeIndex ] );
|
||||
}
|
||||
}
|
||||
|
||||
return pNewTimerEvent;
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
void IotTaskPool_FreeTimerEvent( void * ptr )
|
||||
{
|
||||
/* Return the in-use task pool timer event. */
|
||||
IotStaticMemory_ReturnInUse( ptr,
|
||||
_pTaskPoolTimerEvents,
|
||||
_pInUseTaskPoolTimerEvents,
|
||||
IOT_TASKPOOL_JOBS_RECYCLE_LIMIT,
|
||||
sizeof( _taskPoolTimerEvent_t ) );
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user