Do app modules work with the new config cfe module?

[the-other-james]

I ran into a problem when updating our cFE version from 7f7103a to 761b988, and I think the culprit is the new configuration registry (nasa/cFE#1979) or how we are using app modules.

When building with the latest cFE version I see the following errors:

[ 25%] Building C object es/CMakeFiles/es.dir/fsw/src/cfe_es_task.c.o
In file included from /host/cfs_fsw/cfe/modules/core_api/fsw/inc/cfe_config.h:42,
                 from /host/cfs_fsw/cfe/modules/es/fsw/src/cfe_es_task.c:44:
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:40:3: error: redeclaration of enumerator 'CFE_ConfigIdOffset_MOD_SRCVER_CI'
   40 |   CFE_ConfigIdOffset_MOD_SRCVER_CI/MODULES/MULTI_IF,
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:39:3: note: previous definition of 'CFE_ConfigIdOffset_MOD_SRCVER_CI' was here
   39 |   CFE_ConfigIdOffset_MOD_SRCVER_CI,
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:40:35: error: expected ',' or '}' before '/' token
   40 |   CFE_ConfigIdOffset_MOD_SRCVER_CI/MODULES/MULTI_IF,
      |                                   ^
In file included from /host/cfs_fsw/cfe/modules/core_api/fsw/inc/cfe_config.h:42,
                 from /host/cfs_fsw/cfe/modules/es/fsw/src/cfe_es_task.c:44:
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:91:9: warning: ISO C99 requires whitespace after the macro name
   91 | #define CFE_CONFIGID_MOD_SRCVER_CI/MODULES/MULTI_IF CFE_CONFIGID_C(CFE_ResourceId_FromInteger(CFE_CONFIGID_BASE + CFE_ConfigIdOffset_MOD_SRCVER_CI/MODULES/MULTI_IF))
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:91: warning: "CFE_CONFIGID_MOD_SRCVER_CI" redefined
   91 | #define CFE_CONFIGID_MOD_SRCVER_CI/MODULES/MULTI_IF CFE_CONFIGID_C(CFE_ResourceId_FromInteger(CFE_CONFIGID_BASE + CFE_ConfigIdOffset_MOD_SRCVER_CI/MODULES/MULTI_IF))
      |
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:90: note: this is the location of the previous definition
   90 | #define CFE_CONFIGID_MOD_SRCVER_CI CFE_CONFIGID_C(CFE_ResourceId_FromInteger(CFE_CONFIGID_BASE + CFE_ConfigIdOffset_MOD_SRCVER_CI))
      |
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:93:9: warning: ISO C99 requires whitespace after the macro name
   93 | #define CFE_CONFIGID_MOD_SRCVER_TO/MODULES/MULTI_IF CFE_CONFIGID_C(CFE_ResourceId_FromInteger(CFE_CONFIGID_BASE + CFE_ConfigIdOffset_MOD_SRCVER_TO/MODULES/MULTI_IF))
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:93: warning: "CFE_CONFIGID_MOD_SRCVER_TO" redefined
   93 | #define CFE_CONFIGID_MOD_SRCVER_TO/MODULES/MULTI_IF CFE_CONFIGID_C(CFE_ResourceId_FromInteger(CFE_CONFIGID_BASE + CFE_ConfigIdOffset_MOD_SRCVER_TO/MODULES/MULTI_IF))
      |
/host/cfs_fsw/build-sim/inc/cfe_config_ids.h:92: note: this is the location of the previous definition
   92 | #define CFE_CONFIGID_MOD_SRCVER_TO CFE_CONFIGID_C(CFE_ResourceId_FromInteger(CFE_CONFIGID_BASE + CFE_ConfigIdOffset_MOD_SRCVER_TO))
      |

This is what cfe_config_ids.h looks like:

/* This file is auto-generated from CMake build system.  Do not manually edit! */
#ifndef CFE_CONFIG_IDS_H
#define CFE_CONFIG_IDS_H

#include "cfe_config_api_typedefs.h"
#include "cfe_resourceid.h"
#include "cfe_core_resourceid_basevalues.h"

/* Value offsets from base (needed for macros; do not use directly) */
enum CFE_ConfigIdOffset
{
  CFE_ConfigIdOffset_MISSION_NAME,
  CFE_ConfigIdOffset_MISSION_SRCVER,
  CFE_ConfigIdOffset_CORE_VERSION_MAJOR,
  CFE_ConfigIdOffset_CORE_VERSION_MINOR,
  CFE_ConfigIdOffset_CORE_VERSION_REVISION,
  CFE_ConfigIdOffset_CORE_VERSION_MISSION_REV,
  CFE_ConfigIdOffset_CORE_VERSION_BUILDNUM,
  CFE_ConfigIdOffset_CORE_VERSION_BASELINE,
  CFE_ConfigIdOffset_CORE_VERSION_DESCRIPTION,
  CFE_ConfigIdOffset_CORE_BUILDINFO_DATE,
  CFE_ConfigIdOffset_CORE_BUILDINFO_USER,
  CFE_ConfigIdOffset_CORE_BUILDINFO_HOST,
  CFE_ConfigIdOffset_MOD_SRCVER_CORE_API,
  CFE_ConfigIdOffset_MOD_SRCVER_CORE_PRIVATE,
  CFE_ConfigIdOffset_MOD_SRCVER_CFE_ASSERT,
  CFE_ConfigIdOffset_MOD_SRCVER_RMAP_LIB,
  CFE_ConfigIdOffset_MOD_SRCVER_SPW_LIB,
  CFE_ConfigIdOffset_MOD_SRCVER_SCH,
  CFE_ConfigIdOffset_MOD_SRCVER_SC3M_RHM,
  CFE_ConfigIdOffset_MOD_SRCVER_SC3M_ADC,
  CFE_ConfigIdOffset_MOD_SRCVER_SSC,
  CFE_ConfigIdOffset_MOD_SRCVER_CF,
  CFE_ConfigIdOffset_MOD_SRCVER_CFS_LIB,
  CFE_ConfigIdOffset_MOD_SRCVER_FM,
  CFE_ConfigIdOffset_MOD_SRCVER_IO_LIB,
  CFE_ConfigIdOffset_MOD_SRCVER_CJSON,
  CFE_ConfigIdOffset_MOD_SRCVER_EMHASHMAP,
  CFE_ConfigIdOffset_MOD_SRCVER_CI,
  CFE_ConfigIdOffset_MOD_SRCVER_CI/MODULES/MULTI_IF,
  CFE_ConfigIdOffset_MOD_SRCVER_TO,
  CFE_ConfigIdOffset_MOD_SRCVER_TO/MODULES/MULTI_IF,
  CFE_ConfigIdOffset_MOD_SRCVER_ES,
  CFE_ConfigIdOffset_MOD_SRCVER_EVS,
  CFE_ConfigIdOffset_MOD_SRCVER_FS,
  CFE_ConfigIdOffset_MOD_SRCVER_SB,
  CFE_ConfigIdOffset_MOD_SRCVER_TBL,
  CFE_ConfigIdOffset_MOD_SRCVER_TIME,
  CFE_ConfigIdOffset_MOD_SRCVER_OSAL,
  CFE_ConfigIdOffset_MOD_SRCVER_PSP,
  CFE_ConfigIdOffset_MOD_SRCVER_MSG,
  CFE_ConfigIdOffset_MOD_SRCVER_SBR,
  CFE_ConfigIdOffset_MOD_SRCVER_RESOURCEID,
  CFE_ConfigIdOffset_MOD_SRCVER_CONFIG,

  CFE_ConfigIdOffset_MAX
};

It looks like the enum name for our mutli_if module isn't being generated correctly. Perhaps the problem is the multi_if modules are added to the targets.cmake file applist as ci/modules/multi_if and to/modules/multi_if; perhaps that is where the slashes are coming from?

I tried disabling the config module in cFE, but it looks like es depends upon it.

So is this a problem with the config module? Something else? Should I update how we include those submodules (I seem to remember SBN would add a link such as apps/sbn-tcp -> apps/sbn/modules/tcp)?

Thanks!
James

[skliper]

Yeah, you can't add them that way (with a path).

Really the pattern where modules load there own modules is strongly discouraged. If you do that you are going around ES and all that it provides. I suggest using unique names for the modules (ci_multi_if or whatever) and add their path to the module search path if you want to have them in the same repo. And use ES and the startup script to manage them (as a library or whatever).