doc: use globbing terminology

[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 4f6f227..8835c8f 100644 (file)
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -29,7 +29,7 @@ struct rte_eal_opt_loglevel {
        TAILQ_ENTRY(rte_eal_opt_loglevel) next;
        /** Compiled regular expression obtained from the option */
        regex_t re_match;
-       /** Glob match string option */
+       /** Globbing pattern option */
        char *pattern;
        /** Log level value obtained from the option */
        uint32_t level;
@@ -45,7 +45,7 @@ static struct rte_eal_opt_loglevel_list opt_loglevel_list =
 static FILE *default_log_stream;
 
 /**
- * This global structure stores some informations about the message
+ * This global structure stores some information about the message
  * that is currently being processed by one lcore
  */
 struct log_cur_msg {
@@ -71,6 +71,24 @@ rte_openlog_stream(FILE *f)
        return 0;
 }
 
+FILE *
+rte_log_get_stream(void)
+{
+       FILE *f = rte_logs.file;
+
+       if (f == NULL) {
+               /*
+                * Grab the current value of stderr here, rather than
+                * just initializing default_log_stream to stderr. This
+                * ensures that we will always use the current value
+                * of stderr, even if the application closes and
+                * reopens it.
+                */
+               return default_log_stream ? : stderr;
+       }
+       return f;
+}
+
 /* Set global log level */
 void
 rte_log_set_global_level(uint32_t level)
@@ -94,6 +112,24 @@ rte_log_get_level(uint32_t type)
        return rte_logs.dynamic_types[type].loglevel;
 }
 
+bool
+rte_log_can_log(uint32_t logtype, uint32_t level)
+{
+       int log_level;
+
+       if (level > rte_log_get_global_level())
+               return false;
+
+       log_level = rte_log_get_level(logtype);
+       if (log_level < 0)
+               return false;
+
+       if (level > (uint32_t)log_level)
+               return false;
+
+       return true;
+}
+
 int
 rte_log_set_level(uint32_t type, uint32_t level)
 {
@@ -171,7 +207,7 @@ int rte_log_save_regexp(const char *regex, int tmp)
        return rte_log_save_level(tmp, regex, NULL);
 }
 
-/* set log level based on glob (file match) pattern */
+/* set log level based on globbing pattern */
 int
 rte_log_set_level_pattern(const char *pattern, uint32_t level)
 {
@@ -284,7 +320,7 @@ rte_log_register_type_and_pick_level(const char *name, uint32_t level_def)
                        continue;
 
                if (opt_ll->pattern) {
-                       if (fnmatch(opt_ll->pattern, name, 0))
+                       if (fnmatch(opt_ll->pattern, name, 0) == 0)
                                level = opt_ll->level;
                } else {
                        if (regexec(&opt_ll->re_match, name, 0, NULL, 0) == 0)
@@ -396,27 +432,12 @@ rte_log_dump(FILE *f)
 int
 rte_vlog(uint32_t level, uint32_t logtype, const char *format, va_list ap)
 {
+       FILE *f = rte_log_get_stream();
        int ret;
-       FILE *f = rte_logs.file;
-       if (f == NULL) {
-               f = default_log_stream;
-               if (f == NULL) {
-                       /*
-                        * Grab the current value of stderr here, rather than
-                        * just initializing default_log_stream to stderr. This
-                        * ensures that we will always use the current value
-                        * of stderr, even if the application closes and
-                        * reopens it.
-                        */
-                       f = stderr;
-               }
-       }
 
-       if (level > rte_logs.level)
-               return 0;
        if (logtype >= rte_logs.dynamic_types_len)
                return -1;
-       if (level > rte_logs.dynamic_types[logtype].loglevel)
+       if (!rte_log_can_log(logtype, level))
                return 0;
 
        /* save loglevel and logtype in a global per-lcore variable */