From 3ad04399c576bb7935b9a7b8c07d5acf373a7bc4 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 26 Mar 2012 21:08:46 +0200 Subject: [PATCH] Add named log level Signed-off-by: Jens Axboe --- gclient.c | 2 +- gfio.c | 2 +- log.c | 11 +++++++++++ log.h | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gclient.c b/gclient.c index c77ef14a..8d63586c 100644 --- 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 559c7bd3..6b6d2b82 100644 --- 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 362ab23c..a26dee87 100644 --- 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 2b2cae0c..ad9d08bb 100644 --- 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 -- 2.25.1