Merge pull request #85 from nasa/integration-candidate

ci_lab Integration candidate: 2021-03-30
nasa · Apr 1, 2021 · 4b65271 · 4b65271
2 parents c5714d9 + d8419d3
commit 4b65271
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 26 deletions.
diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c
@@ -40,26 +40,17 @@
 ** CI global data...
 */
 
-/*
- * Declaring the CI_LAB_IngestBuffer as a union
- * ensures it is aligned appropriately to
- * store a CFE_MSG_Message_t type.
- */
-typedef union
-{
-    CFE_MSG_Message_t Msg;
-    uint8             bytes[CI_LAB_MAX_INGEST];
-} CI_LAB_IngestBuffer_t;
-
 typedef struct
 {
     bool            SocketConnected;
     CFE_SB_PipeId_t CommandPipe;
     osal_id_t       SocketID;
     OS_SockAddr_t   SocketAddress;
 
-    CI_LAB_HkTlm_t        HkTlm;
-    CI_LAB_IngestBuffer_t IngestBuffer;
+    CI_LAB_HkTlm_t HkTlm;
+
+    CFE_SB_Buffer_t *NextIngestBufPtr;
+
 } CI_LAB_GlobalData_t;
 
 CI_LAB_GlobalData_t CI_LAB_Global;
@@ -68,7 +59,8 @@ static CFE_EVS_BinFilter_t CI_LAB_EventFilters[] =
     {/* Event ID    mask */
      {CI_LAB_SOCKETCREATE_ERR_EID, 0x0000}, {CI_LAB_SOCKETBIND_ERR_EID, 0x0000}, {CI_LAB_STARTUP_INF_EID, 0x0000},
      {CI_LAB_COMMAND_ERR_EID, 0x0000},      {CI_LAB_COMMANDNOP_INF_EID, 0x0000}, {CI_LAB_COMMANDRST_INF_EID, 0x0000},
-     {CI_LAB_INGEST_INF_EID, 0x0000},       {CI_LAB_INGEST_ERR_EID, 0x0000}};
+     {CI_LAB_INGEST_INF_EID, 0x0000},       {CI_LAB_INGEST_LEN_ERR_EID, 0x0000}, {CI_LAB_INGEST_ALLOC_ERR_EID, 0x0000},
+     {CI_LAB_INGEST_SEND_ERR_EID, 0x0000}};
 
 /*
  * Individual message handler function prototypes
@@ -154,8 +146,6 @@ void CI_LAB_TaskInit(void)
 
     memset(&CI_LAB_Global, 0, sizeof(CI_LAB_Global));
 
-    CFE_ES_RegisterApp();
-
     CFE_EVS_Register(CI_LAB_EventFilters, sizeof(CI_LAB_EventFilters) / sizeof(CFE_EVS_BinFilter_t),
                      CFE_EVS_EventFilter_BINARY);
 
@@ -358,28 +348,52 @@ void CI_LAB_ResetCounters_Internal(void)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
 void CI_LAB_ReadUpLink(void)
 {
-    int   i;
-    int32 status;
+    int    i;
+    int32  status;
+    uint8 *bytes;
 
     for (i = 0; i <= 10; i++)
     {
-        status = OS_SocketRecvFrom(CI_LAB_Global.SocketID, CI_LAB_Global.IngestBuffer.bytes,
-                                   sizeof(CI_LAB_Global.IngestBuffer), &CI_LAB_Global.SocketAddress, OS_CHECK);
+        if (CI_LAB_Global.NextIngestBufPtr == NULL)
+        {
+            CI_LAB_Global.NextIngestBufPtr = CFE_SB_AllocateMessageBuffer(CI_LAB_MAX_INGEST);
+            if (CI_LAB_Global.NextIngestBufPtr == NULL)
+            {
+                CFE_EVS_SendEvent(CI_LAB_INGEST_ALLOC_ERR_EID, CFE_EVS_EventType_ERROR,
+                                  "CI: L%d, buffer allocation failed\n", __LINE__);
+                break;
+            }
+        }
+
+        status = OS_SocketRecvFrom(CI_LAB_Global.SocketID, CI_LAB_Global.NextIngestBufPtr, CI_LAB_MAX_INGEST,
+                                   &CI_LAB_Global.SocketAddress, OS_CHECK);
         if (status >= (int32)sizeof(CFE_MSG_CommandHeader_t) && status <= ((int32)CI_LAB_MAX_INGEST))
         {
             CFE_ES_PerfLogEntry(CI_LAB_SOCKET_RCV_PERF_ID);
             CI_LAB_Global.HkTlm.Payload.IngestPackets++;
-            status = CFE_SB_TransmitMsg(&CI_LAB_Global.IngestBuffer.Msg, false);
+            status = CFE_SB_TransmitBuffer(CI_LAB_Global.NextIngestBufPtr, false);
             CFE_ES_PerfLogExit(CI_LAB_SOCKET_RCV_PERF_ID);
+
+            if (status == CFE_SUCCESS)
+            {
+                /* Set NULL so a new buffer will be obtained next time around */
+                CI_LAB_Global.NextIngestBufPtr = NULL;
+            }
+            else
+            {
+                CFE_EVS_SendEvent(CI_LAB_INGEST_SEND_ERR_EID, CFE_EVS_EventType_ERROR,
+                                  "CI: L%d, CFE_SB_TransmitBuffer() failed, status=%d\n", __LINE__, (int)status);
+            }
         }
         else if (status > 0)
         {
             /* bad size, report as ingest error */
             CI_LAB_Global.HkTlm.Payload.IngestErrors++;
-            CFE_EVS_SendEvent(CI_LAB_INGEST_ERR_EID, CFE_EVS_EventType_ERROR,
-                              "CI: L%d, cmd %0x%0x %0x%0x dropped, bad length=%d\n", __LINE__,
-                              CI_LAB_Global.IngestBuffer.bytes[0], CI_LAB_Global.IngestBuffer.bytes[1],
-                              CI_LAB_Global.IngestBuffer.bytes[2], CI_LAB_Global.IngestBuffer.bytes[3], (int)status);
+
+            bytes = CI_LAB_Global.NextIngestBufPtr->Msg.Byte;
+            CFE_EVS_SendEvent(CI_LAB_INGEST_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
+                              "CI: L%d, cmd %0x%0x %0x%0x dropped, bad length=%d\n", __LINE__, bytes[0], bytes[1],
+                              bytes[2], bytes[3], (int)status);
         }
         else
         {

diff --git a/fsw/src/ci_lab_events.h b/fsw/src/ci_lab_events.h
@@ -37,7 +37,9 @@
 #define CI_LAB_COMMANDNOP_INF_EID   5
 #define CI_LAB_COMMANDRST_INF_EID   6
 #define CI_LAB_INGEST_INF_EID       7
-#define CI_LAB_INGEST_ERR_EID       8
+#define CI_LAB_INGEST_LEN_ERR_EID   8
+#define CI_LAB_INGEST_ALLOC_ERR_EID 9
+#define CI_LAB_INGEST_SEND_ERR_EID  10
 #define CI_LAB_LEN_ERR_EID          16
 
 #endif /* _ci_lab_events_h_ */