From 1b03958cb10b3c254460d38a0324bbb3a1dfb8e4 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 15 Apr 2020 15:45:39 -0400 Subject: [PATCH] Fix #591, Avoid deadlock in CFE_ES_CreatObjects Now uses CFE_ES_SysLogWrite_Unsync inside shared data lock --- fsw/cfe-core/src/es/cfe_es_start.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fsw/cfe-core/src/es/cfe_es_start.c b/fsw/cfe-core/src/es/cfe_es_start.c index 73411dbf6..2cb6383ba 100644 --- a/fsw/cfe-core/src/es/cfe_es_start.c +++ b/fsw/cfe-core/src/es/cfe_es_start.c @@ -869,7 +869,7 @@ void CFE_ES_CreateObjects(void) */ if ( CFE_ES_Global.TaskTable[TaskIndex].RecordUsed == true ) { - CFE_ES_WriteToSysLog("ES Startup: CFE_ES_Global.TaskTable record used error for App: %s, continuing.\n", + CFE_ES_SysLogWrite_Unsync("ES Startup: CFE_ES_Global.TaskTable record used error for App: %s, continuing.\n", CFE_ES_ObjectTable[i].ObjectName); } else @@ -881,7 +881,7 @@ void CFE_ES_CreateObjects(void) strncpy((char *)CFE_ES_Global.TaskTable[TaskIndex].TaskName, (char *)CFE_ES_Global.AppTable[j].TaskInfo.MainTaskName, OS_MAX_API_NAME); CFE_ES_Global.TaskTable[TaskIndex].TaskName[OS_MAX_API_NAME - 1] = '\0'; - CFE_ES_WriteToSysLog("ES Startup: Core App: %s created. App ID: %d\n", + CFE_ES_SysLogWrite_Unsync("ES Startup: Core App: %s created. App ID: %d\n", CFE_ES_ObjectTable[i].ObjectName,j); /*