Merge pull request nasa#1425 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev60
jphickey · Oct 12, 2023 · 0291622 · 0291622
2 parents b5dd01c + e5d9ced
commit 0291622
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v6.0.0-rc4+dev239
+- Add RTEMS console and timebase posix task names
+- See <https://github.com/nasa/osal/pull/1422>
+
 ## Development Build: v6.0.0-rc4+dev235
 - Set RTEMS task name for cpuuse
 - Squash RTEMS sem take timeout bug

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   235
+#define OS_BUILD_NUMBER   239
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*

diff --git a/src/os/rtems/src/os-impl-console.c b/src/os/rtems/src/os-impl-console.c
@@ -32,6 +32,8 @@
 /****************************************************************************************
                                     INCLUDE FILES
  ***************************************************************************************/
+#define _GNU_SOURCE
+#include <pthread.h>
 
 #include "os-rtems.h"
 #include "os-shared-printf.h"
@@ -170,6 +172,8 @@ int32 OS_ConsoleCreate_Impl(const OS_object_token_t *token)
                 }
                 else
                 {
+                    pthread_setname_np(r_task_id, "OS_CONSOLE");
+
                     /* will place the task in 'ready for scheduling' state */
                     status = rtems_task_start(r_task_id,                    /*rtems task id*/
                                               OS_ConsoleTask_Entry,         /* task entry point */

diff --git a/src/os/rtems/src/os-impl-timebase.c b/src/os/rtems/src/os-impl-timebase.c
@@ -26,6 +26,9 @@
 /****************************************************************************************
                                     INCLUDE FILES
  ***************************************************************************************/
+#define _GNU_SOURCE
+#include <pthread.h>
+
 #include "os-rtems.h"
 
 #include "os-shared-common.h"
@@ -388,6 +391,8 @@ int32 OS_TimeBaseCreate_Impl(const OS_object_token_t *token)
         }
         else
         {
+            pthread_setname_np(local->handler_task, "OS_TIMEBASE");
+
             /* will place the task in 'ready for scheduling' state */
             rtems_sc = rtems_task_start(local->handler_task,             /* rtems task id */
                                         OS_TimeBase_CallbackThreadEntry, /* task entry point */