summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2e3382b)
raw | patch | inline | side by side (parent: 2e3382b)
author | Asha <x1101668@ti.com> | |
Fri, 23 Feb 2024 07:26:26 +0000 (12:56 +0530) | ||
committer | Asha <x1101668@ti.com> | |
Wed, 10 Apr 2024 08:55:58 +0000 (14:25 +0530) |
- OsalApp_taskNegativeTests
- Removed TaskP_compileTime_SizeChk as it not used/required
Signed-off-by: Asha <x1101668@ti.com>
- Removed TaskP_compileTime_SizeChk as it not used/required
Signed-off-by: Asha <x1101668@ti.com>
diff --git a/packages/ti/osal/src/freertos/TaskP_freertos.c b/packages/ti/osal/src/freertos/TaskP_freertos.c
index 1837b2059c5e851cfeb01789e83c9f52127f35c6..9099c187e6c6981d3acca3294bda2fa5651ee56c 100644 (file)
/* The function that implements the task being created. */
static void TaskP_Function (void *arg);
-/*
- * Dummy function to check size during compile time
- * ======== TaskP_compileTime_SizeChk ========
- */
-static void TaskP_compileTime_SizeChk(void);
-
/**
* \brief Value to be used for lowest priority task
*/
uint32_t gOsalTaskAllocCnt = 0U, gOsalTaskPeak = 0U;
-static void TaskP_compileTime_SizeChk(void)
-{
-#if defined(__GNUC__) && !defined(__ti__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#else
-/* TI compiler */
-#if defined(__clang__)
-/* Clang compiler*/
-#pragma clang diagnostic ignored "-Wunused-variable"
-#else
-#pragma diag_suppress 179
-#endif
-#endif
- OSAL_COMPILE_TIME_SIZE_CHECK ((uint32_t)sizeof(TaskP_freertos),OSAL_FREERTOS_TASKP_SIZE_BYTES);
-#if defined(__GNUC__) && !defined(__ti__)
-#pragma GCC diagnostic pop
-#endif
-}
-
static void TaskP_Function (void *arg)
{
TaskP_freertos *handle = (TaskP_freertos *)(arg);
diff --git a/packages/ti/osal/src/safertos/TaskP_SafeRTOS.c b/packages/ti/osal/src/safertos/TaskP_SafeRTOS.c
index 635f2b83f0518078fa77ec374a0ddb8497b27510..8ccf2765fbb1afcf4a38b0a14dbec04d1660cde9 100644 (file)
#include "SafeRTOS_priv.h"
#include "SafeRTOS_config.h"
-portTaskHandleType TaskP_getSafeRTOSHandle( TaskP_Handle handle );
+portTaskHandleType TaskP_getSafeRTOSHandle(TaskP_Handle handle);
/**
* \brief Value to be used for lowest priority task
/* The function that implements the task being created. */
static void TaskP_Function (void *arg);
-/*
- * Dummy function to check size during compile time
- * ======== TaskP_compileTime_SizeChk ========
- */
-static void TaskP_compileTime_SizeChk(void);
-
/* global pool of statically allocated task pools */
static TaskP_SafeRTOS gOsalTaskPSafeRTOSPool[OSAL_SAFERTOS_CONFIGNUM_TASK];
extern uint32_t gSaftRtosInitDone;
-static void TaskP_compileTime_SizeChk( void )
-{
-#if defined( __GNUC__ ) && !defined( __ti__ )
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#else
-/* TI compiler */
-#if defined(__clang__)
-/* Clang compiler*/
-#pragma clang diagnostic ignored "-Wunused-variable"
-#else
-#pragma diag_suppress 179
-#endif
-#endif
- OSAL_COMPILE_TIME_SIZE_CHECK ( ( uint32_t )sizeof( TaskP_SafeRTOS ),OSAL_SAFERTOS_TASKP_SIZE_BYTES );
-#if defined( __GNUC__ ) && !defined( __ti__ )
-#pragma GCC diagnostic pop
-#endif
-}
-
static void TaskP_Function ( void *arg )
{
TaskP_SafeRTOS *handle = ( TaskP_SafeRTOS * )( arg );
TaskP_SafeRTOS *taskHandle = (TaskP_SafeRTOS *)handle;
DebugP_assert(NULL_PTR != handle);
- DebugP_assert((bool)false != taskHandle->used);
+ DebugP_assert(BFALSE != taskHandle->used);
/* SafeRTOS doesn't support this functionality, return 0 */
diff --git a/packages/ti/osal/test/osal_extended_testapp/makefile_rtos.mk b/packages/ti/osal/test/osal_extended_testapp/makefile_rtos.mk
index 0edc6709f252d6c14f1e48f4b184f5ace5876e1c..2fd7b138e947329e4f98e03207d45672a531742c 100644 (file)
PACKAGE_SRCS_COMMON = src osal_extended_test.h makefile_rtos.mk
SRCDIR = src
-INCDIR = . ../src
+INCDIR = . ../src ../../src/safertos
# Common source files across all platforms and cores
SRCS_COMMON += osal_extended_testapp.c
SRCS_COMMON += osal_extended_testapp_hwi.c osal_extended_testapp_mutex.c osal_extended_testapp_cache.c
diff --git a/packages/ti/osal/test/osal_extended_testapp/osal_extended_test.h b/packages/ti/osal/test/osal_extended_testapp/osal_extended_test.h
index 2c96676257db2ee3919083a3008d79607a51e41c..22d7e5c826c636f0a10e7f4a47b42deac4646230 100644 (file)
#include "OSAL_log.h"
#include "OSAL_board.h"
+#if defined(SAFERTOS)
+#include <SafeRTOS_API.h>
+#endif
+
/* ========================================================================== */
/* Macros & Typedefs */
/* ========================================================================== */
diff --git a/packages/ti/osal/test/osal_extended_testapp/src/osal_extended_testapp.c b/packages/ti/osal/test/osal_extended_testapp/src/osal_extended_testapp.c
index 55a92d6e1db24f0f32ce626e13d2d317ae0d081a..172380fdec09544351ab759afc2d2107d3e8648c 100644 (file)
/* Loading before Task is created */
#if defined(FREERTOS)
LoadP_update();
+OS_stop();
#endif
TaskP_Params taskParams;
-
OS_init();
memset( gAppTskStackMain, 0xFF, sizeof( gAppTskStackMain ) );
TaskP_Params_init(&taskParams);
diff --git a/packages/ti/osal/test/osal_extended_testapp/src/osal_extended_testapp_task.c b/packages/ti/osal/test/osal_extended_testapp/src/osal_extended_testapp_task.c
index beb907d99a3d232b1343330d03c72c37df95ca73..d41e0d86bc96b1efd8089db8c55e92ffe7bbdc85 100644 (file)
*/
static int32_t OsalApp_taskIsTerminated(void);
+/*
+ * Description : Testing Negative checks for Task APIs
+ */
+static int32_t OsalApp_taskNegativeTests(void);
+
+#if defined(SAFERTOS)
+extern portTaskHandleType TaskP_getSafeRTOSHandle( TaskP_Handle handle );
+#endif
+
/* ========================================================================== */
/* Internal Function Definitions */
/* ========================================================================== */
}
}
- if(osal_OK == result)
- {
- OSAL_log("Creating max tasks test has passed!!\n");
- }
- else
+ if(osal_OK != result)
{
OSAL_log("Creating max tasks test has failed!!\n");
}
{
result = osal_FAILURE;
}
-
- if(osal_OK == result)
+#if defined(FREERTOS)
+ if(0U == TaskP_getTaskStackHighWatermark(gOsalAppTaskPSelfmacroTaskHandle))
+#elif defined(SAFERTOS)
+ /* SafeRTOS doesn't support WaterMark functionality, always returns zero */
+ if(0U != TaskP_getTaskStackHighWatermark(gOsalAppTaskPSelfmacroTaskHandle))
+#endif
{
- OSAL_log("General TaskP test has passed!!\n");
+ result = osal_FAILURE;
}
- else
+
+ if(osal_OK != result)
{
OSAL_log("Generel TaskP test has failed!!\n");
}
result = osal_FAILURE;
}
- if(osal_OK == result)
+ if(osal_OK != result)
{
- OSAL_log("TaskP Termination test check has passed!!\n");
+ OSAL_log("TaskP Termination test check has failed!!\n");
}
- else
+
+ return result;
+}
+
+static int32_t OsalApp_taskNegativeTests(void)
+{
+ TaskP_Params params;
+ TaskP_Handle handle;
+ int32_t result = osal_OK;
+
+#if defined(FREERTOS)
+ TaskP_Params_init(NULL_PTR);
+ uint32_t key = 0U;
+
+ key = TaskP_disable();
+
+ TaskP_restore(key);
+#endif
+
+ TaskP_Params_init(¶ms);
+ params.priority = OSAL_APP_PRIORITY_HIGHEST;
+ memset(gOsalAppTskStack, 0, sizeof(gOsalAppTskStack));
+ params.stack = gOsalAppTskStack[0];
+ params.stacksize = OSAL_APP_TASK_STACK_SIZE;
+
+ handle = TaskP_create((TaskP_Fxn)OsalApp_dummytaskFxn, ¶ms);
+ if(NULL_PTR == handle)
{
- OSAL_log("TaskP Termination test check has failed!!\n");
+ result = osal_FAILURE;
+ }
+
+#if defined(SAFERTOS)
+ if(NULL_PTR == TaskP_getSafeRTOSHandle(handle))
+ {
+ result = osal_FAILURE;
+ }
+#endif
+
+ if((TaskP_OK != TaskP_delete(&handle)) || (TaskP_OK == TaskP_delete(NULL_PTR)))
+ {
+ result = osal_FAILURE;
+ }
+
+ if(osal_OK != result)
+ {
+ OSAL_log("\n OsalApp_taskNegativeTests failed \n");
}
return result;
result += OsalApp_taskCreateMaxTaskTest();
result += OsalApp_taskGeneralTests();
result += OsalApp_taskIsTerminated();
+ result += OsalApp_taskNegativeTests();
if(osal_OK == result)
{
- OSAL_log("All TaskP tests have passed!!\n");
+ OSAL_log(" All TaskP tests have passed!!\n");
}
else
{
- OSAL_log("Some or all TaskP tests have failed!!\n");
+ OSAL_log(" Some or all TaskP tests have failed!!\n");
}
return result;