Add named log level

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/gclient.c b/gclient.c
index c77ef14aa55d1a9d62a4695c4e376526ee7b38e9..8d63586ceb91fd7b0ba6d26379c928d3236624a8 100644 (file)
--- a/gclient.c
+++ b/gclient.c
@@ -122,7 +122,7 @@ static void gfio_text_op(struct fio_client *client, struct fio_net_cmd *cmd)
        gtk_list_store_append(ui->log_model, &iter);
        gtk_list_store_set(ui->log_model, &iter, 0, timebuf, -1);
        gtk_list_store_set(ui->log_model, &iter, 1, client->hostname, -1);
-       gtk_list_store_set(ui->log_model, &iter, 2, p->level, -1);
+       gtk_list_store_set(ui->log_model, &iter, 2, log_get_level(p->level), -1);
        gtk_list_store_set(ui->log_model, &iter, 3, p->buf, -1);
 
        if (p->level == FIO_LOG_ERR)

diff --git a/gfio.c b/gfio.c
index 559c7bd35b37af65bdc2406c1d80451010700086..6b6d2b824c94b08b91e8d710ae7305499ba94c56 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -293,7 +293,7 @@ static void gfio_ui_setup_log(struct gui *ui)
        GtkListStore *model;
        GtkWidget *tree_view;
 
-       model = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
+       model = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
        tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
        gtk_widget_set_can_focus(tree_view, FALSE);

diff --git a/log.c b/log.c
index 362ab23c9813b9366c78ff55b4de8ffdd013a631..a26dee8775cb751eb786cb562cfafbcf4decdca5 100644 (file)
--- a/log.c
+++ b/log.c
@@ -93,3 +93,14 @@ int log_err(const char *format, ...)
                return fwrite(buffer, len, 1, f_err);
        }
 }
+
+const char *log_get_level(int level)
+{
+       static const char *levels[] = { "Unknown", "Debug", "Info", "Error",
+                                               "Unknown" };
+
+       if (level >= FIO_LOG_NR)
+               level = FIO_LOG_NR;
+
+       return levels[level];
+}

diff --git a/log.h b/log.h
index 2b2cae0c74ee1aa975d5d91cf966c657ce0cc2d7..ad9d08bbe6730fcf3750ec30e54d5d2b6265f330 100644 (file)
--- a/log.h
+++ b/log.h
@@ -17,6 +17,9 @@ enum {
        FIO_LOG_DEBUG   = 1,
        FIO_LOG_INFO    = 2,
        FIO_LOG_ERR     = 3,
+       FIO_LOG_NR      = 4,
 };
 
+extern const char *log_get_level(int level);
+
 #endif