New upstream version 17.11.1

[deb_dpdk.git] / lib / librte_eal / common / eal_common_log.c

diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c
index ddf65b7..4b2409a 100644 (file)
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -89,14 +89,6 @@ rte_log_set_global_level(uint32_t level)
        rte_logs.level = (uint32_t)level;
 }
 
-/* Set global log level */
-/* replaced by rte_log_set_global_level */
-__rte_deprecated void
-rte_set_log_level(uint32_t level)
-{
-       rte_log_set_global_level(level);
-}
-
 /* Get global log level */
 uint32_t
 rte_log_get_global_level(void)
@@ -104,36 +96,13 @@ rte_log_get_global_level(void)
        return rte_logs.level;
 }
 
-/* Get global log level */
-/* replaced by rte_log_get_global_level */
-uint32_t
-rte_get_log_level(void)
-{
-       return rte_log_get_global_level();
-}
-
-/* Set global log type */
-__rte_deprecated void
-rte_set_log_type(uint32_t type, int enable)
+int
+rte_log_get_level(uint32_t type)
 {
-       if (type < RTE_LOGTYPE_FIRST_EXT_ID) {
-               if (enable)
-                       rte_logs.type |= 1 << type;
-               else
-                       rte_logs.type &= ~(1 << type);
-       }
-
-       if (enable)
-               rte_log_set_level(type, 0);
-       else
-               rte_log_set_level(type, RTE_LOG_DEBUG);
-}
+       if (type >= rte_logs.dynamic_types_len)
+               return -1;
 
-/* Get global log type */
-__rte_deprecated uint32_t
-rte_get_log_type(void)
-{
-       return rte_logs.type;
+       return rte_logs.dynamic_types[type].loglevel;
 }
 
 int
@@ -170,16 +139,18 @@ rte_log_set_level_regexp(const char *pattern, uint32_t level)
                        rte_logs.dynamic_types[i].loglevel = level;
        }
 
+       regfree(&r);
+
        return 0;
 }
 
-/* get the current loglevel for the message beeing processed */
+/* get the current loglevel for the message being processed */
 int rte_log_cur_msg_loglevel(void)
 {
        return RTE_PER_LCORE(log_cur_msg).loglevel;
 }
 
-/* get the current logtype for the message beeing processed */
+/* get the current logtype for the message being processed */
 int rte_log_cur_msg_logtype(void)
 {
        return RTE_PER_LCORE(log_cur_msg).logtype;
@@ -280,7 +251,8 @@ static const struct logtype logtype_strings[] = {
        {RTE_LOGTYPE_USER8,      "user8"}
 };
 
-RTE_INIT(rte_log_init);
+/* Logging should be first initializer (before drivers and bus) */
+RTE_INIT_PRIO(rte_log_init, 101);
 static void
 rte_log_init(void)
 {