Add TERMIATE_MESSAGE to DU/CU tasks, add warning/trace IDs

common/utils/T/T_messages.txt

@@ -868,46 +868,64 @@ ID = LEGACY_F1U_ERROR
     GROUP = ALL:LEGACY_F1U:LEGACY_GROUP_ERROR:LEGACY
     FORMAT = string,log
 
+ID = LEGACY_F1AP_TRACE
+    DESC = F1AP TRACE LEVEL
+    GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
 ID = LEGACY_F1AP_DEBUG
     DESC = F1AP DEBUG LEVEL
     GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_DEBUG:LEGACY
     FORMAT = string,log
-
 ID = LEGACY_F1AP_INFO
     DESC = F1AP INFO LEVEL
     GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_INFO:LEGACY
     FORMAT = string,log
-
+ID = LEGACY_F1AP_WARNING
+    DESC = F1AP WARNING LEVEL
+    GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
 ID = LEGACY_F1AP_ERROR
     DESC = F1AP ERROR LEVEL
     GROUP = ALL:LEGACY_F1AP:LEGACY_GROUP_ERROR:LEGACY
     FORMAT = string,log
 
+ID = LEGACY_CU_F1AP_TRACE
+    DESC = CU_F1AP TRACE LEVEL
+    GROUP = ALL:LEGACY_CU_F1AP:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
 ID = LEGACY_CU_F1AP_DEBUG
     DESC = CU_F1AP DEBUG LEVEL
     GROUP = ALL:LEGACY_CU_F1AP:LEGACY_GROUP_DEBUG:LEGACY
     FORMAT = string,log
-
 ID = LEGACY_CU_F1AP_INFO
     DESC = CU_F1AP INFO LEVEL
     GROUP = ALL:LEGACY_CU_F1AP:LEGACY_GROUP_INFO:LEGACY
     FORMAT = string,log
-
+ID = LEGACY_CU_F1AP_WARNING
+    DESC = CU_F1AP WARNING LEVEL
+    GROUP = ALL:LEGACY_CU_F1AP:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
 ID = LEGACY_CU_F1AP_ERROR
     DESC = CU_F1AP ERROR LEVEL
     GROUP = ALL:LEGACY_CU_F1AP:LEGACY_GROUP_ERROR:LEGACY
     FORMAT = string,log
 
+ID = LEGACY_DU_F1AP_TRACE
+    DESC = DU_F1AP TRACE LEVEL
+    GROUP = ALL:LEGACY_DU_F1AP:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
 ID = LEGACY_DU_F1AP_DEBUG
     DESC = DU_F1AP DEBUG LEVEL
     GROUP = ALL:LEGACY_DU_F1AP:LEGACY_GROUP_DEBUG:LEGACY
     FORMAT = string,log
-
 ID = LEGACY_DU_F1AP_INFO
     DESC = DU_F1AP INFO LEVEL
     GROUP = ALL:LEGACY_DU_F1AP:LEGACY_GROUP_INFO:LEGACY
     FORMAT = string,log
-
+ID = LEGACY_DU_F1AP_WARNING
+    DESC = DU_F1AP WARNING LEVEL
+    GROUP = ALL:LEGACY_DU_F1AP:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
 ID = LEGACY_DU_F1AP_ERROR
     DESC = DU_F1AP ERROR LEVEL
     GROUP = ALL:LEGACY_DU_F1AP:LEGACY_GROUP_ERROR:LEGACY

openair2/F1AP/CU_F1AP.c

@@ -163,6 +163,11 @@ void *F1AP_CU_task(void *arg) {
         CU_handle_sctp_data_ind(&received_msg->ittiMsg.sctp_data_ind);
         break;
 
+      case TERMINATE_MESSAGE:
+        LOG_W(CU_F1AP, " *** Exiting CU_F1AP thread\n");
+        itti_exit_task();
+        break;
+
       default:
         LOG_E(CU_F1AP, "CU Received unhandled message: %d:%s\n",
                   ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));

openair2/F1AP/DU_F1AP.c

@@ -148,6 +148,11 @@ void *F1AP_DU_task(void *arg) {
         DU_handle_sctp_data_ind(&received_msg->ittiMsg.sctp_data_ind);
         break;
 
+      case TERMINATE_MESSAGE:
+        LOG_W(DU_F1AP, " *** Exiting DU_F1AP thread\n");
+        itti_exit_task();
+        break;
+
       default:
         LOG_E(DU_F1AP, "DU Received unhandled message: %d:%s\n",
                   ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));