From 9f0789e0d02193be156e79312f0423f88abb0a75 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Wed, 16 Mar 2016 17:41:16 +0100
Subject: [PATCH] - add groups in T_messages.txt - minor fix

---
 T_messages.txt    | 200 ++++++++++++++++++++++++++++++++++++++++++++++
 tracer/database.c |   2 +-
 2 files changed, 201 insertions(+), 1 deletion(-)

diff --git a/T_messages.txt b/T_messages.txt
index 043062c598..ba6197b569 100644
--- a/T_messages.txt
+++ b/T_messages.txt
@@ -42,128 +42,328 @@ ID = LEGACY_PHY_TRACE
     GROUP = PHY:TRACE:LEGACY
 
 ID = LEGACY_S1AP_INFO
+    DESC = S1AP legacy logs - info level
+    GROUP = S1AP:INFO:LEGACY
 ID = LEGACY_S1AP_ERROR
+    DESC = S1AP legacy logs - error level
+    GROUP = S1AP:ERROR:LEGACY
 ID = LEGACY_S1AP_WARNING
+    DESC = S1AP legacy logs - warning level
+    GROUP = S1AP:WARNING:LEGACY
 ID = LEGACY_S1AP_DEBUG
+    DESC = S1AP legacy logs - debug level
+    GROUP = S1AP:DEBUG:LEGACY
 ID = LEGACY_S1AP_TRACE
+    DESC = S1AP legacy logs - trace level
+    GROUP = S1AP:TRACE:LEGACY
 
 ID = LEGACY_RRC_INFO
+    DESC = RRC legacy logs - info level
+    GROUP = RRC:INFO:LEGACY
 ID = LEGACY_RRC_ERROR
+    DESC = RRC legacy logs - error level
+    GROUP = RRC:ERROR:LEGACY
 ID = LEGACY_RRC_WARNING
+    DESC = RRC legacy logs - warning level
+    GROUP = RRC:WARNING:LEGACY
 ID = LEGACY_RRC_DEBUG
+    DESC = RRC legacy logs - debug level
+    GROUP = RRC:DEBUG:LEGACY
 ID = LEGACY_RRC_TRACE
+    DESC = RRC legacy logs - trace level
+    GROUP = RRC:TRACE:LEGACY
 
 ID = LEGACY_RLC_INFO
+    DESC = RLC legacy logs - info level
+    GROUP = RLC:INFO:LEGACY
 ID = LEGACY_RLC_ERROR
+    DESC = RLC legacy logs - error level
+    GROUP = RLC:ERROR:LEGACY
 ID = LEGACY_RLC_WARNING
+    DESC = RLC legacy logs - warning level
+    GROUP = RLC:WARNING:LEGACY
 ID = LEGACY_RLC_DEBUG
+    DESC = RLC legacy logs - debug level
+    GROUP = RLC:DEBUG:LEGACY
 ID = LEGACY_RLC_TRACE
+    DESC = RLC legacy logs - trace level
+    GROUP = RLC:TRACE:LEGACY
 
 ID = LEGACY_PDCP_INFO
+    DESC = PDCP legacy logs - info level
+    GROUP = PDCP:INFO:LEGACY
 ID = LEGACY_PDCP_ERROR
+    DESC = PDCP legacy logs - error level
+    GROUP = PDCP:ERROR:LEGACY
 ID = LEGACY_PDCP_WARNING
+    DESC = PDCP legacy logs - warning level
+    GROUP = PDCP:WARNING:LEGACY
 ID = LEGACY_PDCP_DEBUG
+    DESC = PDCP legacy logs - debug level
+    GROUP = PDCP:DEBUG:LEGACY
 ID = LEGACY_PDCP_TRACE
+    DESC = PDCP legacy logs - trace level
+    GROUP = PDCP:TRACE:LEGACY
 
 ID = LEGACY_ENB_APP_INFO
+    DESC = ENB_APP legacy logs - info level
+    GROUP = ENB_APP:INFO:LEGACY
 ID = LEGACY_ENB_APP_ERROR
+    DESC = ENB_APP legacy logs - error level
+    GROUP = ENB_APP:ERROR:LEGACY
 ID = LEGACY_ENB_APP_WARNING
+    DESC = ENB_APP legacy logs - warning level
+    GROUP = ENB_APP:WARNING:LEGACY
 ID = LEGACY_ENB_APP_DEBUG
+    DESC = ENB_APP legacy logs - debug level
+    GROUP = ENB_APP:DEBUG:LEGACY
 ID = LEGACY_ENB_APP_TRACE
+    DESC = ENB_APP legacy logs - trace level
+    GROUP = ENB_APP:TRACE:LEGACY
 
 ID = LEGACY_SCTP_INFO
+    DESC = SCTP legacy logs - info level
+    GROUP = SCTP:INFO:LEGACY
 ID = LEGACY_SCTP_ERROR
+    DESC = SCTP legacy logs - error level
+    GROUP = SCTP:ERROR:LEGACY
 ID = LEGACY_SCTP_WARNING
+    DESC = SCTP legacy logs - warning level
+    GROUP = SCTP:WARNING:LEGACY
 ID = LEGACY_SCTP_DEBUG
+    DESC = SCTP legacy logs - debug level
+    GROUP = SCTP:DEBUG:LEGACY
 ID = LEGACY_SCTP_TRACE
+    DESC = SCTP legacy logs - trace level
+    GROUP = SCTP:TRACE:LEGACY
 
 ID = LEGACY_UDP__INFO
+    DESC = UDP_ legacy logs - info level
+    GROUP = UDP_:INFO:LEGACY
 ID = LEGACY_UDP__ERROR
+    DESC = UDP_ legacy logs - error level
+    GROUP = UDP_:ERROR:LEGACY
 ID = LEGACY_UDP__WARNING
+    DESC = UDP_ legacy logs - warning level
+    GROUP = UDP_:WARNING:LEGACY
 ID = LEGACY_UDP__DEBUG
+    DESC = UDP_ legacy logs - debug level
+    GROUP = UDP_:DEBUG:LEGACY
 ID = LEGACY_UDP__TRACE
+    DESC = UDP_ legacy logs - trace level
+    GROUP = UDP_:TRACE:LEGACY
 
 ID = LEGACY_NAS_INFO
+    DESC = NAS legacy logs - info level
+    GROUP = NAS:INFO:LEGACY
 ID = LEGACY_NAS_ERROR
+    DESC = NAS legacy logs - error level
+    GROUP = NAS:ERROR:LEGACY
 ID = LEGACY_NAS_WARNING
+    DESC = NAS legacy logs - warning level
+    GROUP = NAS:WARNING:LEGACY
 ID = LEGACY_NAS_DEBUG
+    DESC = NAS legacy logs - debug level
+    GROUP = NAS:DEBUG:LEGACY
 ID = LEGACY_NAS_TRACE
+    DESC = NAS legacy logs - trace level
+    GROUP = NAS:TRACE:LEGACY
 
 ID = LEGACY_HW_INFO
+    DESC = HW legacy logs - info level
+    GROUP = HW:INFO:LEGACY
 ID = LEGACY_HW_ERROR
+    DESC = HW legacy logs - error level
+    GROUP = HW:ERROR:LEGACY
 ID = LEGACY_HW_WARNING
+    DESC = HW legacy logs - warning level
+    GROUP = HW:WARNING:LEGACY
 ID = LEGACY_HW_DEBUG
+    DESC = HW legacy logs - debug level
+    GROUP = HW:DEBUG:LEGACY
 ID = LEGACY_HW_TRACE
+    DESC = HW legacy logs - trace level
+    GROUP = HW:TRACE:LEGACY
 
 ID = LEGACY_EMU_INFO
+    DESC = EMU legacy logs - info level
+    GROUP = EMU:INFO:LEGACY
 ID = LEGACY_EMU_ERROR
+    DESC = EMU legacy logs - error level
+    GROUP = EMU:ERROR:LEGACY
 ID = LEGACY_EMU_WARNING
+    DESC = EMU legacy logs - warning level
+    GROUP = EMU:WARNING:LEGACY
 ID = LEGACY_EMU_DEBUG
+    DESC = EMU legacy logs - debug level
+    GROUP = EMU:DEBUG:LEGACY
 ID = LEGACY_EMU_TRACE
+    DESC = EMU legacy logs - trace level
+    GROUP = EMU:TRACE:LEGACY
 
 ID = LEGACY_OTG_INFO
+    DESC = OTG legacy logs - info level
+    GROUP = OTG:INFO:LEGACY
 ID = LEGACY_OTG_ERROR
+    DESC = OTG legacy logs - error level
+    GROUP = OTG:ERROR:LEGACY
 ID = LEGACY_OTG_WARNING
+    DESC = OTG legacy logs - warning level
+    GROUP = OTG:WARNING:LEGACY
 ID = LEGACY_OTG_DEBUG
+    DESC = OTG legacy logs - debug level
+    GROUP = OTG:DEBUG:LEGACY
 ID = LEGACY_OTG_TRACE
+    DESC = OTG legacy logs - trace level
+    GROUP = OTG:TRACE:LEGACY
 
 ID = LEGACY_OCG_INFO
+    DESC = OCG legacy logs - info level
+    GROUP = OCG:INFO:LEGACY
 ID = LEGACY_OCG_ERROR
+    DESC = OCG legacy logs - error level
+    GROUP = OCG:ERROR:LEGACY
 ID = LEGACY_OCG_WARNING
+    DESC = OCG legacy logs - warning level
+    GROUP = OCG:WARNING:LEGACY
 ID = LEGACY_OCG_DEBUG
+    DESC = OCG legacy logs - debug level
+    GROUP = OCG:DEBUG:LEGACY
 ID = LEGACY_OCG_TRACE
+    DESC = OCG legacy logs - trace level
+    GROUP = OCG:TRACE:LEGACY
 
 ID = LEGACY_OMG_INFO
+    DESC = OMG legacy logs - info level
+    GROUP = OMG:INFO:LEGACY
 ID = LEGACY_OMG_ERROR
+    DESC = OMG legacy logs - error level
+    GROUP = OMG:ERROR:LEGACY
 ID = LEGACY_OMG_WARNING
+    DESC = OMG legacy logs - warning level
+    GROUP = OMG:WARNING:LEGACY
 ID = LEGACY_OMG_DEBUG
+    DESC = OMG legacy logs - debug level
+    GROUP = OMG:DEBUG:LEGACY
 ID = LEGACY_OMG_TRACE
+    DESC = OMG legacy logs - trace level
+    GROUP = OMG:TRACE:LEGACY
 
 ID = LEGACY_OPT_INFO
+    DESC = OPT legacy logs - info level
+    GROUP = OPT:INFO:LEGACY
 ID = LEGACY_OPT_ERROR
+    DESC = OPT legacy logs - error level
+    GROUP = OPT:ERROR:LEGACY
 ID = LEGACY_OPT_WARNING
+    DESC = OPT legacy logs - warning level
+    GROUP = OPT:WARNING:LEGACY
 ID = LEGACY_OPT_DEBUG
+    DESC = OPT legacy logs - debug level
+    GROUP = OPT:DEBUG:LEGACY
 ID = LEGACY_OPT_TRACE
+    DESC = OPT legacy logs - trace level
+    GROUP = OPT:TRACE:LEGACY
 
 ID = LEGACY_GTPU_INFO
+    DESC = GTPU legacy logs - info level
+    GROUP = GTPU:INFO:LEGACY
 ID = LEGACY_GTPU_ERROR
+    DESC = GTPU legacy logs - error level
+    GROUP = GTPU:ERROR:LEGACY
 ID = LEGACY_GTPU_WARNING
+    DESC = GTPU legacy logs - warning level
+    GROUP = GTPU:WARNING:LEGACY
 ID = LEGACY_GTPU_DEBUG
+    DESC = GTPU legacy logs - debug level
+    GROUP = GTPU:DEBUG:LEGACY
 ID = LEGACY_GTPU_TRACE
+    DESC = GTPU legacy logs - trace level
+    GROUP = GTPU:TRACE:LEGACY
 
 ID = LEGACY_TMR_INFO
+    DESC = TMR legacy logs - info level
+    GROUP = TMR:INFO:LEGACY
 ID = LEGACY_TMR_ERROR
+    DESC = TMR legacy logs - error level
+    GROUP = TMR:ERROR:LEGACY
 ID = LEGACY_TMR_WARNING
+    DESC = TMR legacy logs - warning level
+    GROUP = TMR:WARNING:LEGACY
 ID = LEGACY_TMR_DEBUG
+    DESC = TMR legacy logs - debug level
+    GROUP = TMR:DEBUG:LEGACY
 ID = LEGACY_TMR_TRACE
+    DESC = TMR legacy logs - trace level
+    GROUP = TMR:TRACE:LEGACY
 
 ID = LEGACY_OSA_INFO
+    DESC = OSA legacy logs - info level
+    GROUP = OSA:INFO:LEGACY
 ID = LEGACY_OSA_ERROR
+    DESC = OSA legacy logs - error level
+    GROUP = OSA:ERROR:LEGACY
 ID = LEGACY_OSA_WARNING
+    DESC = OSA legacy logs - warning level
+    GROUP = OSA:WARNING:LEGACY
 ID = LEGACY_OSA_DEBUG
+    DESC = OSA legacy logs - debug level
+    GROUP = OSA:DEBUG:LEGACY
 ID = LEGACY_OSA_TRACE
+    DESC = OSA legacy logs - trace level
+    GROUP = OSA:TRACE:LEGACY
 
 # this is a bad hack but I won't fix (function util_print_hex_octets
 # in openairinterface5g/openair2/LAYER2/PDCP_v10.1.0/pdcp_util.c
 # does funky things with the LOG_x macros but we work on the C pre-processor
 # level and this funkyness is not easily dealable with, so be it...)
 ID = LEGACY_component_INFO
+    DESC = component legacy logs - info level
+    GROUP = component:INFO:LEGACY
 ID = LEGACY_component_ERROR
+    DESC = component legacy logs - error level
+    GROUP = component:ERROR:LEGACY
 ID = LEGACY_component_WARNING
+    DESC = component legacy logs - warning level
+    GROUP = component:WARNING:LEGACY
 ID = LEGACY_component_DEBUG
+    DESC = component legacy logs - debug level
+    GROUP = component:DEBUG:LEGACY
 ID = LEGACY_component_TRACE
+    DESC = component legacy logs - trace level
+    GROUP = component:TRACE:LEGACY
 ID = LEGACY_componentP_INFO
+    DESC = componentP legacy logs - info level
+    GROUP = componentP:INFO:LEGACY
 ID = LEGACY_componentP_ERROR
+    DESC = componentP legacy logs - error level
+    GROUP = componentP:ERROR:LEGACY
 ID = LEGACY_componentP_WARNING
+    DESC = componentP legacy logs - warning level
+    GROUP = componentP:WARNING:LEGACY
 ID = LEGACY_componentP_DEBUG
+    DESC = componentP legacy logs - debug level
+    GROUP = componentP:DEBUG:LEGACY
 ID = LEGACY_componentP_TRACE
+    DESC = componentP legacy logs - trace level
+    GROUP = componentP:TRACE:LEGACY
 
 #needed?
 ID = LEGACY_CLI_INFO
+    DESC = CLI legacy logs - info level
+    GROUP = CLI:INFO:LEGACY
 ID = LEGACY_CLI_ERROR
+    DESC = CLI legacy logs - error level
+    GROUP = CLI:ERROR:LEGACY
 ID = LEGACY_CLI_WARNING
+    DESC = CLI legacy logs - warning level
+    GROUP = CLI:WARNING:LEGACY
 ID = LEGACY_CLI_DEBUG
+    DESC = CLI legacy logs - debug level
+    GROUP = CLI:DEBUG:LEGACY
 ID = LEGACY_CLI_TRACE
+    DESC = CLI legacy logs - trace level
+    GROUP = CLI:TRACE:LEGACY
 
 #for debug/test - not used
 ID = first
diff --git a/tracer/database.c b/tracer/database.c
index 3172105250..a430d1a696 100644
--- a/tracer/database.c
+++ b/tracer/database.c
@@ -292,7 +292,7 @@ static void onoff_id(database *d, char *name, int *a, int onoff)
   i = bsearch(&(id){name:name}, d->i, d->isize, sizeof(id), id_cmp);
   if (i == NULL) return;
   a[i->id] = onoff;
-  printf("turning %s %s\n", name, onoff ? "ON" : "OFF");
+  printf("turning %s %s\n", onoff ? "ON" : "OFF", name);
 }
 
 static void onoff_group(database *d, char *name, int *a, int onoff)
-- 
GitLab