Changeset eab3d04 in mainline

Timestamp:

2012-08-16T11:36:54Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

494f417

Parents:

1c67b41

Message:

Allow specifying of log level as a name

Location:

uspace

Files:

• app/logset/main.c (modified) (1 diff)
• lib/c/generic/io/log.c (modified) (2 diffs)
• lib/c/generic/io/logctl.c (modified) (1 diff)
• lib/c/include/io/log.h (modified) (1 diff)

uspace/app/logset/main.c

@@ -47 +47 @@
         }
 
-        log_level_t new_default_level = (log_level_t) strtol(argv[1], NULL, 0);
+        log_level_t new_default_level;
+        int rc = log_level_from_str(argv[1], &new_default_level);
+        if (rc != EOK) {
+                fprintf(stderr, "Unrecognised log level '%s': %s.\n",
+                    argv[1], str_error(rc));
+        }
 
-        int rc = logctl_set_default_level(new_default_level);
+        rc = logctl_set_default_level(new_default_level);
 
         if (rc != EOK) {

uspace/lib/c/generic/io/log.c

@@ -52 +52 @@
         "note",
         "debug",
-        "debug2"
+        "debug2",
+        NULL
 };
 
@@ -179 +180 @@
 }
 
+int log_level_from_str(const char *name, log_level_t *level_out)
+{
+        log_level_t level = LVL_FATAL;
+
+        while (log_level_names[level] != NULL) {
+                if (str_cmp(name, log_level_names[level]) == 0) {
+                        if (level_out != NULL)
+                                *level_out = level;
+                        return EOK;
+                }
+                level++;
+        }
+
+        /* Maybe user specified number directly. */
+        char *end_ptr;
+        int level_int = strtol(name, &end_ptr, 0);
+        if ((end_ptr == name) || (str_length(end_ptr) != 0))
+                return EINVAL;
+        if (level_int < 0)
+                return ERANGE;
+        if (level_int >= (int) LVL_LIMIT)
+                return ERANGE;
+
+        if (level_out != NULL)
+                *level_out = (log_level_t) level_int;
+
+        return EOK;
+}
+
 /** Initialize the logging system.
  *

uspace/lib/c/generic/io/logctl.c

@@ -84 +84 @@
                 return EINVAL;
 
-        char level_str[10];
-        str_cpy(level_str, 10, (const char *) argument);
+        char level_str[20];
+        str_cpy(level_str, 20, (const char *) argument);
 
-        int level_int = strtol(level_str, NULL, 0);
-
-        log_level_t boot_level = (log_level_t) level_int;
-        if (boot_level >= LVL_LIMIT)
-                return EINVAL;
+        log_level_t boot_level;
+        int rc = log_level_from_str(level_str, &boot_level);
+        if (rc != EOK)
+                return rc;
 
         if (level != NULL)

uspace/lib/c/include/io/log.h

@@ -51 +51 @@
 
 extern const char *log_level_str(log_level_t);
+extern int log_level_from_str(const char *, log_level_t *);
 
 extern bool __log_shall_record(log_level_t);