Update legacy log types regex strings used for registering dynamic logs. Signed-off-by: Pavan Nikhilesh <pbhagavat...@caviumnetworks.com> Reviewed-by: Ferruh Yigit <ferruh.yi...@intel.com> Reviewed-by: Olivier Matz <olivier.m...@6wind.com> ---
v2 Changes: - Corrected dynamic log regex strings of 'librte.flow_classify' and 'librte.member' to 'lib.flow_classify' and 'lib.member'. - Rebased on top of [1]. - reverted changes to test/test/test.h in reference with [1]. [1] http://dpdk.org/dev/patchwork/patch/32038/ lib/librte_eal/common/eal_common_log.c | 39 ++++++++++++++-------------- lib/librte_flow_classify/rte_flow_classify.c | 2 +- lib/librte_member/rte_member.c | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index e894b75ec..fa9ac7247 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -219,26 +219,27 @@ struct logtype { }; static const struct logtype logtype_strings[] = { - {RTE_LOGTYPE_EAL, "eal"}, - {RTE_LOGTYPE_MALLOC, "malloc"}, - {RTE_LOGTYPE_RING, "ring"}, - {RTE_LOGTYPE_MEMPOOL, "mempool"}, - {RTE_LOGTYPE_TIMER, "timer"}, + {RTE_LOGTYPE_EAL, "lib.eal"}, + {RTE_LOGTYPE_MALLOC, "lib.malloc"}, + {RTE_LOGTYPE_RING, "lib.ring"}, + {RTE_LOGTYPE_MEMPOOL, "lib.mempool"}, + {RTE_LOGTYPE_TIMER, "lib.timer"}, {RTE_LOGTYPE_PMD, "pmd"}, - {RTE_LOGTYPE_HASH, "hash"}, - {RTE_LOGTYPE_LPM, "lpm"}, - {RTE_LOGTYPE_KNI, "kni"}, - {RTE_LOGTYPE_ACL, "acl"}, - {RTE_LOGTYPE_POWER, "power"}, - {RTE_LOGTYPE_METER, "meter"}, - {RTE_LOGTYPE_SCHED, "sched"}, - {RTE_LOGTYPE_PORT, "port"}, - {RTE_LOGTYPE_TABLE, "table"}, - {RTE_LOGTYPE_PIPELINE, "pipeline"}, - {RTE_LOGTYPE_MBUF, "mbuf"}, - {RTE_LOGTYPE_CRYPTODEV, "cryptodev"}, - {RTE_LOGTYPE_EFD, "efd"}, - {RTE_LOGTYPE_EVENTDEV, "eventdev"}, + {RTE_LOGTYPE_HASH, "lib.hash"}, + {RTE_LOGTYPE_LPM, "lib.lpm"}, + {RTE_LOGTYPE_KNI, "lib.kni"}, + {RTE_LOGTYPE_ACL, "lib.acl"}, + {RTE_LOGTYPE_POWER, "lib.power"}, + {RTE_LOGTYPE_METER, "lib.meter"}, + {RTE_LOGTYPE_SCHED, "lib.sched"}, + {RTE_LOGTYPE_PORT, "lib.port"}, + {RTE_LOGTYPE_TABLE, "lib.table"}, + {RTE_LOGTYPE_PIPELINE, "lib.pipeline"}, + {RTE_LOGTYPE_MBUF, "lib.mbuf"}, + {RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"}, + {RTE_LOGTYPE_EFD, "lib.efd"}, + {RTE_LOGTYPE_EVENTDEV, "lib.eventdev"}, + {RTE_LOGTYPE_GSO, "lib.gso"}, {RTE_LOGTYPE_USER1, "user1"}, {RTE_LOGTYPE_USER2, "user2"}, {RTE_LOGTYPE_USER3, "user3"}, diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/librte_flow_classify/rte_flow_classify.c index e6f448643..72bc8b821 100644 --- a/lib/librte_flow_classify/rte_flow_classify.c +++ b/lib/librte_flow_classify/rte_flow_classify.c @@ -685,7 +685,7 @@ static void librte_flow_classify_init_log(void) { librte_flow_classify_logtype = - rte_log_register("librte.flow_classify"); + rte_log_register("lib.flow_classify"); if (librte_flow_classify_logtype >= 0) rte_log_set_level(librte_flow_classify_logtype, RTE_LOG_INFO); } diff --git a/lib/librte_member/rte_member.c b/lib/librte_member/rte_member.c index cc9ea84ae..84354cc38 100644 --- a/lib/librte_member/rte_member.c +++ b/lib/librte_member/rte_member.c @@ -330,7 +330,7 @@ RTE_INIT(librte_member_init_log); static void librte_member_init_log(void) { - librte_member_logtype = rte_log_register("librte.member"); + librte_member_logtype = rte_log_register("lib.member"); if (librte_member_logtype >= 0) rte_log_set_level(librte_member_logtype, RTE_LOG_DEBUG); } -- 2.14.1
