osal Integration candidate: Equuleus-rc1+dev5 #1451

dzbaker · 2024-02-22T14:09:09Z

Checklist (Please check before submitting)

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

Describe the contribution

PR Fix #1433, use virtual path as name for FS_BASED maps #1448. Addresses Issue OS_FileSysAddFixedMap should use the virtual vs physical path name #1433
PR Fix #1452, Remove softsleep, as a dead store. #1146. Addresses Issue Softsleep is no longer used #1452
PR Fix #1356, Remove stray remaining 'goto' in OSAL test code #1357. Addresses Issue Stray remaining use of 'goto' in test code #1356
PR Fix #1353, Align mismatched function prototype/implem. parameter names #1354. Addresses Issue Scrub for mismatched function prototype/implementation parameter names #1353
PR Fix #1330, Move variables declared mid-function to the top #1331. Addresses Issue Variables declared mid-function #1330

Testing performed
cFS Bundle Checks
osal Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@thesamprice
@thnkslprpt

…er names

Use the "virtual_path" instead of "device_name" as the name record for FS_BASED entries. This should allow duplicate detection to work as expected. The device_name on mappings made via this method will now be an empty string. It is not relevant because this type of map is used for devices that are already mounted.

Fix #1433, use virtual path as name for FS_BASED maps

src/os/posix/src/os-impl-tasks.c

Fix #1452, Remove softsleep, as a dead store.

…ng-goto Fix #1356, Remove stray remaining 'goto' in OSAL test code

…-parameter-names Fix #1353, Align mismatched function prototype/implem. parameter names

…mid-function Fix #1330, Move variables declared mid-function to the top

src/os/shared/src/osapi-module.c

@@ -296,28 +296,28 @@
 *           See description in API and header file for detail
 *
 *-----------------------------------------------------------------*/
-int32 OS_ModuleInfo(osal_id_t module_id, OS_module_prop_t *module_prop)
+int32 OS_ModuleInfo(osal_id_t module_id, OS_module_prop_t *module_info)


src/os/shared/src/osapi-module.c

@@ -420,7 +420,7 @@
 *           See description in API and header file for detail
 *
 *-----------------------------------------------------------------*/
-int32 OS_SymbolTableDump(const char *filename, size_t SizeLimit)
+int32 OS_SymbolTableDump(const char *filename, size_t size_limit)


src/os/shared/src/osapi-module.c

@@ -331,29 +331,29 @@
 *           See description in API and header file for detail
 *
 *-----------------------------------------------------------------*/
-int32 OS_SymbolLookup(cpuaddr *SymbolAddress, const char *SymbolName)
+int32 OS_SymbolLookup(cpuaddr *symbol_address, const char *SymbolName)


src/os/shared/src/osapi-idmap.c

@@ -1358,7 +1358,7 @@
 *           See description in API and header file for detail
 *
 *-----------------------------------------------------------------*/
-void OS_ForEachObjectOfType(osal_objtype_t idtype, osal_id_t creator_id, OS_ArgCallback_t callback_ptr,
+void OS_ForEachObjectOfType(osal_objtype_t objtype, osal_id_t creator_id, OS_ArgCallback_t callback_ptr,


src/os/portable/os-impl-posix-files.c

@@ -126,7 +126,7 @@
 *           See prototype for argument/return detail
 *
 *-----------------------------------------------------------------*/
-int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *FileStats)
+int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *filestat)


src/os/shared/src/osapi-timebase.c

@@ -90,7 +90,7 @@
 *           See description in API and header file for detail
 *
 *-----------------------------------------------------------------*/
-int32 OS_TimeBaseCreate(osal_id_t *timer_id, const char *timebase_name, OS_TimerSync_t external_sync)
+int32 OS_TimeBaseCreate(osal_id_t *timebase_id, const char *timebase_name, OS_TimerSync_t external_sync)


src/os/shared/src/osapi-time.c

@@ -197,10 +197,10 @@
 *           See description in API and header file for detail
 *
 *-----------------------------------------------------------------*/
-int32 OS_TimerAdd(osal_id_t *timer_id, const char *timer_name, osal_id_t timebase_ref_id, OS_ArgCallback_t callback_ptr,
+int32 OS_TimerAdd(osal_id_t *timer_id, const char *timer_name, osal_id_t timebase_id, OS_ArgCallback_t callback_ptr,


src/os/shared/src/osapi-time.c

@@ -226,7 +226,8 @@
 *           See description in API and header file for detail
 *
 *-----------------------------------------------------------------*/
-int32 OS_TimerCreate(osal_id_t *timer_id, const char *timer_name, uint32 *accuracy, OS_TimerCallback_t callback_ptr)
+int32 OS_TimerCreate(osal_id_t *timer_id, const char *timer_name, uint32 *clock_accuracy,


src/os/shared/src/osapi-idmap.c

@@ -1368,7 +1368,7 @@
    filter.user_callback = callback_ptr;
    filter.user_arg      = callback_arg;

-    if (OS_ObjectIdIteratorInit(OS_ForEachFilterCreator, &filter, idtype, &iter) == OS_SUCCESS)
+    if (OS_ObjectIdIteratorInit(OS_ForEachFilterCreator, &filter, objtype, &iter) == OS_SUCCESS)


src/os/portable/os-impl-posix-files.c

@@ -126,7 +126,7 @@
 *           See prototype for argument/return detail
 *
 *-----------------------------------------------------------------*/
-int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *FileStats)
+int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *filestat)


Sam Price and others added 6 commits January 20, 2023 14:45

Remove softsleep, as a dead store.

da4fa3d

Fix #1356, Remove stray remaining 'goto' in OSAL test code

373130e

Fix #1353, Align mismatched function prototype/implementation paramet…

a92b2b7

…er names

Fix #1330, Move variables declared mid-function to the top

6e0f541

Merge pull request #1448 from jphickey:fix-1433-fixedmap

04149d8

Fix #1433, use virtual path as name for FS_BASED maps

github-advanced-security bot found potential problems Feb 22, 2024

View reviewed changes

src/os/posix/src/os-impl-tasks.c Fixed Show fixed Hide fixed

src/os/posix/src/os-impl-tasks.c Fixed Show fixed Hide fixed

dzbaker added 5 commits February 23, 2024 07:42

Merge pull request #1446 from thesamprice:deadStore

fff0725

Fix #1452, Remove softsleep, as a dead store.

Merge pull request #1357 from thnkslprpt:fix-1356-remove-stray-remani…

c51a337

…ng-goto Fix #1356, Remove stray remaining 'goto' in OSAL test code

Merge pull request #1354 from thnkslprpt:fix-1353-mismatched-function…

e7add95

…-parameter-names Fix #1353, Align mismatched function prototype/implem. parameter names

Merge pull request #1331 from thnkslprpt:fix-1330-variables-declared-…

b88b641

…mid-function Fix #1330, Move variables declared mid-function to the top

Updating documentation and version numbers for equuleus-rc1+dev53

2484176

dzbaker force-pushed the integration-candidate branch from 05bf65d to 2484176 Compare February 23, 2024 12:50

github-advanced-security bot found potential problems Feb 23, 2024

View reviewed changes

dzbaker merged commit 53550ca into main Feb 23, 2024
30 of 31 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

osal Integration candidate: Equuleus-rc1+dev5 #1451

osal Integration candidate: Equuleus-rc1+dev5 #1451

dzbaker commented Feb 22, 2024 •

edited

Loading

osal Integration candidate: Equuleus-rc1+dev5 #1451

osal Integration candidate: Equuleus-rc1+dev5 #1451

Conversation

dzbaker commented Feb 22, 2024 • edited Loading

dzbaker commented Feb 22, 2024 •

edited

Loading