From f95926646136c5867aa8ee85467d3c2c791da3f2 Mon Sep 17 00:00:00 2001 From: gaurav-aws Date: Tue, 23 Jul 2019 04:16:32 +0000 Subject: [PATCH] Update projects to use the new directory name IotTaskPool_GetSystemTaskPool has been removed from the cut down version of the task pool. define IOT_SYSTEM_TASKPOOL to NULL so that the MQTT library builds successfully. Use the new #defines in the iot_config.h. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2697 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj | 70 +++++++-------- .../mqtt/WIN32.vcxproj.filters | 68 +++++++------- .../FreeRTOS_IoT_Libraries/mqtt/iot_config.h | 89 +++++++++++++------ .../task_pool/WIN32.vcxproj | 24 ++--- .../task_pool/WIN32.vcxproj.filters | 22 ++--- .../common/include/types/iot_taskpool_types.h | 6 +- 6 files changed, 155 insertions(+), 124 deletions(-) diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj index 62df0590a..ce524b3d2 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\Source\FreeRTOS-Plus-IoT-SDK\c_sdk\standard\mqtt\include;..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\FreeRTOS-Plus-IoT-SDK\c_sdk\standard\common\include\private;..\..\..\Source\FreeRTOS-Plus-IoT-SDK\c_sdk\standard\common\include;..\..\..\Source\FreeRTOS-Plus-IoT-SDK\abstractions\platform\include;..\..\..\Source\FreeRTOS-Plus-IoT-SDK\abstractions\platform\freertos\include;..\..\..\Source\FreeRTOS-Plus-IoT-SDK\abstractions\secure_sockets\include;.;%(AdditionalIncludeDirectories) + ..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\mqtt\include;..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include\private;..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include;..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\secure_sockets\include;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -145,18 +145,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -187,28 +187,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj.filters index 4ef425d1f..10628c44e 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/WIN32.vcxproj.filters @@ -163,43 +163,43 @@ FreeRTOS+\FreeRTOS+TCP - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\task_pool - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\logging - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\src - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\secure_sockets\freertos_plus_tcp DemoTasks - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos @@ -275,72 +275,72 @@ FreeRTOS\Source\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\types - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\types - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\mqtt\include\types - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\platform - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\secure_sockets\include - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\secure_sockets\include - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\secure_sockets\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/iot_config.h b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/iot_config.h index 2889a2bfb..a326f471e 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/iot_config.h +++ b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/mqtt/iot_config.h @@ -24,36 +24,67 @@ #ifndef IOT_CONFIG_H_ #define IOT_CONFIG_H_ +/* Use platform types on FreeRTOS. */ +#include "FreeRTOS.h" +#include "platform/iot_platform_types_freertos.h" //_RB_Makes common config file FreeRTOS specific + +/* + * Set this to the number of recyclable tasks for the task pool to cache. + * + * Caching dynamically allocated tasks (recyclable tasks) helps the application + * to limit the number of allocations at runtime. Caching recyclable tasks may + * help making the application more responsive and predictable, by removing a + * potential for memory allocation failures, but it may also have negative + * repercussions on the amount of memory available at any given time. It is up + * to the application developer to strike the correct balance these competing + * needs. The task pool will cache when the application calling + * IotTaskPool_RecycleJob. Any recycled tasks in excess of + * IOT_TASKPOOL_JOBS_RECYCLE_LIMIT will be destroyed and its memory will be + * release. + * + * Default value (if undefined): 8 + */ +#define IOT_TASKPOOL_JOBS_RECYCLE_LIMIT 8 + +/* + * Set this to 1 to perform sanity checks when using the task pool library. + * + * Asserts are useful for debugging, but should be disabled in production code. + * If this is set to 1, IotTaskPool_Assert can be defined to set the assertion + * function; otherwise, the standard library's assert function will be used. + * + * Possible values: 0 (asserts disabled) or 1 (asserts enabled) + * Recommended values: 1 when debugging; 0 in production code. + * Default value (if undefined): 0 + */ +#define IOT_TASKPOOL_ENABLE_ASSERTS 1 + +/* + * Set the log level of the task pool library. + * + * Log messages from the task pool library at or below this setting will be + * printed. + * + * Possible values: One of the Log levels. + * Default value (if undefined): IOT_LOG_LEVEL_GLOBAL; if that is undefined, + * then IOT_LOG_NONE. + */ +#define IOT_LOG_LEVEL_TASKPOOL IOT_LOG_INFO + +/* + * + */ +#define IOT_TASKPOOL_NUMBER_OF_WORKERS 3 + +/* + * + */ +#define IOT_TASKPOOL_WORKER_STACK_SIZE_BYTES 2048 + /* How long the MQTT library will wait for PINGRESPs or PUBACKs. */ -#define IOT_MQTT_RESPONSE_WAIT_MS ( 10000 ) - -/* MQTT demo configuration. */ -#define IOT_DEMO_MQTT_PUBLISH_BURST_COUNT ( 10 ) -#define IOT_DEMO_MQTT_PUBLISH_BURST_SIZE ( 2 ) - -/* Shadow demo configuration. The demo publishes periodic Shadow updates and responds - * to changing Shadows. */ -#define AWS_IOT_DEMO_SHADOW_UPDATE_COUNT ( 20 ) /* Number of updates to publish. */ -#define AWS_IOT_DEMO_SHADOW_UPDATE_PERIOD_MS ( 3000 ) /* Period of Shadow updates. */ - -/* Library logging configuration. IOT_LOG_LEVEL_GLOBAL provides a global log - * level for all libraries; the library-specific settings override the global - * setting. If both the library-specific and global settings are undefined, - * no logs will be printed. */ -#define IOT_LOG_LEVEL_GLOBAL IOT_LOG_INFO -#define IOT_LOG_LEVEL_DEMO IOT_LOG_INFO -#define IOT_LOG_LEVEL_PLATFORM IOT_LOG_NONE -#define IOT_LOG_LEVEL_NETWORK IOT_LOG_INFO -#define IOT_LOG_LEVEL_TASKPOOL IOT_LOG_NONE -#define IOT_LOG_LEVEL_MQTT IOT_LOG_INFO -#define AWS_IOT_LOG_LEVEL_SHADOW IOT_LOG_INFO -#define AWS_IOT_LOG_LEVEL_DEFENDER IOT_LOG_INFO - -/* Platform thread stack size and priority. */ -#define IOT_THREAD_DEFAULT_STACK_SIZE 2048 -#define IOT_THREAD_DEFAULT_PRIORITY 5 - -#define AWS_IOT_MQTT_ENABLE_METRICS 0 //_RB_ added +#define IOT_MQTT_RESPONSE_WAIT_MS ( 10000 ) + +#define AWS_IOT_MQTT_ENABLE_METRICS 0 /* Include the common configuration file for FreeRTOS. */ #include "iot_config_common.h" diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/task_pool/WIN32.vcxproj b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/task_pool/WIN32.vcxproj index fd7b68118..4c7704c70 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/task_pool/WIN32.vcxproj +++ b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/task_pool/WIN32.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\FreeRTOS-Plus-IoT-SDK\c_sdk\standard\common\include;..\..\..\Source\FreeRTOS-Plus-IoT-SDK\abstractions\platform\include;..\..\..\Source\FreeRTOS-Plus-IoT-SDK\abstractions\platform\freertos\include;.;%(AdditionalIncludeDirectories) + ..\..\..\Source\FreeRTOS-Plus-TCP\include;..\..\..\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;.\DemoTasks\include;.\WinPCap;..\..\..\..\FreeRTOS\Source\include;..\..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\Source\FreeRTOS-IoT-Libraries\c_sdk\standard\common\include;..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\include;..\..\..\Source\FreeRTOS-IoT-Libraries\abstractions\platform\freertos\include;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDLL @@ -144,9 +144,9 @@ - - - + + + @@ -177,14 +177,14 @@ - - - - - - - - + + + + + + + + diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/task_pool/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/task_pool/WIN32.vcxproj.filters index 215f940eb..4f426c818 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/task_pool/WIN32.vcxproj.filters +++ b/FreeRTOS-Plus/Demo/FreeRTOS_IoT_Libraries/task_pool/WIN32.vcxproj.filters @@ -145,16 +145,16 @@ FreeRTOS+\FreeRTOS+TCP - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\task_pool DemoTasks - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\logging - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos @@ -230,30 +230,30 @@ FreeRTOS\Source\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\types - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private - + FreeRTOS+\FreeRTOS IoT Libraries\standard\common\include\private - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\freertos\include\platform - + FreeRTOS+\FreeRTOS IoT Libraries\abstractions\platform\include\types diff --git a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/types/iot_taskpool_types.h b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/types/iot_taskpool_types.h index ce80167c2..a09e8133f 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/types/iot_taskpool_types.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-IoT-Libraries/c_sdk/standard/common/include/types/iot_taskpool_types.h @@ -352,11 +352,11 @@ typedef struct IotTaskPoolInfo #define IOT_TASKPOOL_JOB_HIGH_PRIORITY ( ( uint32_t ) 0x00000001 ) /** - * @brief Allows the use of the handle to the system task pool. + * @brief Allows the use of the system task pool. * - * @warning The task pool handle is not valid unless @ref IotTaskPool_CreateSystemTaskPool is + * @warning The system task pool handle is not valid unless @ref IotTaskPool_CreateSystemTaskPool is * called before the handle is used. */ -#define IOT_SYSTEM_TASKPOOL ( IotTaskPool_GetSystemTaskPool() ) +#define IOT_SYSTEM_TASKPOOL ( NULL ) #endif /* ifndef IOT_TASKPOOL_TYPES_H_ */ -- 2.39.2