Skip to content

Commit

Permalink
Fix nasa#591, Avoid deadlock in CFE_ES_CreatObjects
Browse files Browse the repository at this point in the history
Now uses CFE_ES_WriteToSysLog_Unsync inside shared data lock
  • Loading branch information
skliper committed Apr 15, 2020
1 parent 60a5f65 commit 284807b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fsw/cfe-core/src/es/cfe_es_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_WriteToSysLog_Unsync("ES Startup: CFE_ES_Global.TaskTable record used error for App: %s, continuing.\n",
CFE_ES_ObjectTable[i].ObjectName);
}
else
Expand All @@ -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_WriteToSysLog_Unsync("ES Startup: Core App: %s created. App ID: %d\n",
CFE_ES_ObjectTable[i].ObjectName,j);

/*
Expand Down

0 comments on commit 284807b

Please sign in to comment.