]> git.ozlabs.org Git - petitboot/commitdiff
logging: Clean up debug logs
authorJeremy Kerr <jk@ozlabs.org>
Fri, 1 Nov 2013 02:31:00 +0000 (10:31 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Fri, 1 Nov 2013 07:32:52 +0000 (15:32 +0800)
We have quite a few pb_logs which should be pb_debug. This change moves
developer-specific info to pb_debug.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
17 files changed:
discover/device-handler.c
discover/discover-server.c
discover/network.c
discover/parser-conf.c
discover/parser.c
discover/udev.c
discover/user-event.c
ui/common/joystick.c
ui/common/ps3.c
ui/ncurses/nc-cui.c
ui/ncurses/nc-menu.h
ui/ncurses/nc-scr.h
ui/ncurses/ps3-main.c
ui/twin/main-generic.c
ui/twin/pbt-client.c
ui/twin/pbt-scr.c
ui/twin/pbt-scr.h

index af9fbba3e0dfbd3803772659c1adca6e377375d3..43bcd9f760249444d86eae8587bfb8725d8987b6 100644 (file)
@@ -440,7 +440,7 @@ static bool resource_resolve(struct resource *res, const char *name,
        if (resource_is_resolved(res))
                return true;
 
        if (resource_is_resolved(res))
                return true;
 
-       pb_log("Attempting to resolve resource %s->%s with parser %s\n",
+       pb_debug("Attempting to resolve resource %s->%s with parser %s\n",
                        opt->option->id, name, parser->name);
        parser->resolve_resource(handler, res);
 
                        opt->option->id, name, parser->name);
        parser->resolve_resource(handler, res);
 
@@ -502,13 +502,13 @@ static void process_boot_option_queue(struct device_handler *handler)
        list_for_each_entry_safe(&handler->unresolved_boot_options,
                        opt, tmp, list) {
 
        list_for_each_entry_safe(&handler->unresolved_boot_options,
                        opt, tmp, list) {
 
-               pb_log("queue: attempting resolution for %s\n",
+               pb_debug("queue: attempting resolution for %s\n",
                                opt->option->id);
 
                if (!boot_option_resolve(opt, handler))
                        continue;
 
                                opt->option->id);
 
                if (!boot_option_resolve(opt, handler))
                        continue;
 
-               pb_log("\tresolved!\n");
+               pb_debug("\tresolved!\n");
 
                list_remove(&opt->list);
                list_add_tail(&opt->device->boot_options, &opt->list);
 
                list_remove(&opt->list);
                list_add_tail(&opt->device->boot_options, &opt->list);
index 2467e33dc97ac5b9cfc45c44576f18d6f969c79a..41a4fde130a69567020f96bbfe477264a5041e1a 100644 (file)
@@ -74,12 +74,12 @@ static void print_clients(struct discover_server *server)
 {
        struct client *client;
 
 {
        struct client *client;
 
-       pb_log("current clients [%p,%p,%p]:\n",
+       pb_debug("current clients [%p,%p,%p]:\n",
                        &server->clients.head,
                        server->clients.head.prev,
                        server->clients.head.next);
        list_for_each_entry(&server->clients, client, list)
                        &server->clients.head,
                        server->clients.head.prev,
                        server->clients.head.next);
        list_for_each_entry(&server->clients, client, list)
-               pb_log("\t[%p,%p,%p] client: %d\n", &client->list,
+               pb_debug("\t[%p,%p,%p] client: %d\n", &client->list,
                                client->list.prev, client->list.next,
                                client->fd);
 }
                                client->list.prev, client->list.next,
                                client->fd);
 }
index d39f7a7c0ef57af83ae39b26e4bcb10acf4b26dd..b9b0c5043f58e3131b0789f1948257051d0f5831 100644 (file)
@@ -204,7 +204,7 @@ static int interface_down(struct interface *interface)
 static void udhcpc_process_exit(struct process *process)
 {
        struct interface *interface = process->data;
 static void udhcpc_process_exit(struct process *process)
 {
        struct interface *interface = process->data;
-       pb_log("udhcp client [pid %d] for interface %s exited, rc %d\n",
+       pb_debug("udhcp client [pid %d] for interface %s exited, rc %d\n",
                        process->pid, interface->name, process->exit_status);
        interface->udhcpc_process = NULL;
        process_release(process);
                        process->pid, interface->name, process->exit_status);
        interface->udhcpc_process = NULL;
        process_release(process);
index 3154a463c6908a5ea4b3e05a15b10c3f5bc468a4..79193ed76622397e2517e59683b6aa11a1ac82fd 100644 (file)
@@ -181,7 +181,7 @@ int conf_set_global_option(struct conf_context *conf, const char *name,
                if (streq(name, conf->global_options[i].name)) {
                        conf->global_options[i].value
                                = talloc_strdup(conf, value);
                if (streq(name, conf->global_options[i].name)) {
                        conf->global_options[i].value
                                = talloc_strdup(conf, value);
-                       pb_log("%s: %s = '%s'\n", __func__, name, value);
+                       pb_debug("%s: %s = '%s'\n", __func__, name, value);
                        return 1;
                }
        }
                        return 1;
                }
        }
index e83b994e11cf1a3833f9cdd6bb6755590909f6df..7b701181811d4f358b777b2ea2ea8394c431f95b 100644 (file)
@@ -140,7 +140,7 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
                        if (i->parser->method != CONF_METHOD_LOCAL_FILE)
                                continue;
 
                        if (i->parser->method != CONF_METHOD_LOCAL_FILE)
                                continue;
 
-                       pb_log("\ttrying parser '%s'\n", i->parser->name);
+                       pb_debug("\ttrying parser '%s'\n", i->parser->name);
                        ctx->parser = i->parser;
                        iterate_parser_files(ctx, ctx->parser);
                }
                        ctx->parser = i->parser;
                        iterate_parser_files(ctx, ctx->parser);
                }
@@ -158,7 +158,7 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
                        if (i->parser->method != method)
                                continue;
 
                        if (i->parser->method != method)
                                continue;
 
-                       pb_log("\ttrying parser '%s'\n", i->parser->name);
+                       pb_debug("\ttrying parser '%s'\n", i->parser->name);
                        ctx->parser = i->parser;
                        i->parser->parse(ctx, buf, len);
                }
                        ctx->parser = i->parser;
                        i->parser->parse(ctx, buf, len);
                }
index 6212e4309137f47feb97cd0b09043193fdc13191..0c656f35f3d707189ad6200c75426d8cb0c94f6b 100644 (file)
 #include "pb-discover.h"
 #include "device-handler.h"
 
 #include "pb-discover.h"
 #include "device-handler.h"
 
-#if defined(DEBUG)
-#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args)
-#define DBGS(fmt, args...) \
-       pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
-#else
-#define DBG(fmt, args...)
-#define DBGS(fmt, args...)
-#endif
-
 struct pb_udev {
        struct udev *udev;
        struct udev_monitor *monitor;
 struct pb_udev {
        struct udev *udev;
        struct udev_monitor *monitor;
@@ -323,7 +314,7 @@ struct pb_udev *udev_init(struct waitset *waitset,
        waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
                udev_process, udev->monitor);
 
        waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
                udev_process, udev->monitor);
 
-       pb_log("%s: waiting on udev\n", __func__);
+       pb_debug("%s: waiting on udev\n", __func__);
 
        return udev;
 
 
        return udev;
 
index 275d9e24244a430b46201e0a55c7cce86877aa1e..4b56de48177c0561f6f78b223e52599c7879cb5f 100644 (file)
@@ -65,11 +65,11 @@ static void user_event_print_event(struct event __attribute__((unused)) *event)
 {
        int i;
 
 {
        int i;
 
-       pb_log("user_event %s event:\n", event_action_name(event->action));
-       pb_log("\tdevice: %s\n", event->device);
+       pb_debug("user_event %s event:\n", event_action_name(event->action));
+       pb_debug("\tdevice: %s\n", event->device);
 
        for (i = 0; i < event->n_params; i++)
 
        for (i = 0; i < event->n_params; i++)
-               pb_log("\t%-12s => %s\n",
+               pb_debug("\t%-12s => %s\n",
                        event->params[i].name, event->params[i].value);
 }
 
                        event->params[i].name, event->params[i].value);
 }
 
@@ -276,7 +276,7 @@ static int user_event_process(void *arg)
                return 0;
        }
 
                return 0;
        }
 
-       pb_log("%s: %u bytes\n", __func__, len);
+       pb_debug("%s: %u bytes\n", __func__, len);
 
        user_event_handle_message(uev, buf, len);
 
 
        user_event_handle_message(uev, buf, len);
 
@@ -287,7 +287,7 @@ static int user_event_destructor(void *arg)
 {
        struct user_event *uev = arg;
 
 {
        struct user_event *uev = arg;
 
-       pb_log("%s\n", __func__);
+       pb_debug("%s\n", __func__);
 
        if (uev->socket >= 0)
                close(uev->socket);
 
        if (uev->socket >= 0)
                close(uev->socket);
@@ -328,7 +328,7 @@ struct user_event *user_event_init(struct waitset *waitset,
        waiter_register_io(waitset, uev->socket, WAIT_IN,
                        user_event_process, uev);
 
        waiter_register_io(waitset, uev->socket, WAIT_IN,
                        user_event_process, uev);
 
-       pb_log("%s: waiting on %s\n", __func__, PBOOT_USER_EVENT_SOCKET);
+       pb_debug("%s: waiting on %s\n", __func__, PBOOT_USER_EVENT_SOCKET);
 
        return uev;
 
 
        return uev;
 
index 94c85feba4ba1f1111e07d928879a04854e68b02..4faf8b6248ab09ee1d1bac901d4efa7cb068de2e 100644 (file)
@@ -94,7 +94,7 @@ struct pjs *pjs_init(void *ctx, int (*map)(const struct js_event *))
 
        talloc_set_destructor(pjs, pjs_destructor);
 
 
        talloc_set_destructor(pjs, pjs_destructor);
 
-       pb_log("%s: using %s\n", __func__, dev_name);
+       pb_debug("%s: using %s\n", __func__, dev_name);
 
        return pjs;
 
 
        return pjs;
 
index c62a10d20dffc4f5f8eee107ac42ffa04c549d0a..d3ca6d606872e9f60f167897428aad1886223543 100644 (file)
@@ -141,11 +141,11 @@ int ps3_flash_get_values(struct ps3_flash_values *values)
        if (!result)
                values->video_mode = (uint16_t)tmp;
 
        if (!result)
                values->video_mode = (uint16_t)tmp;
 
-       pb_log("%s: default_item: %x\n", __func__,
+       pb_debug("%s: default_item: %x\n", __func__,
                (unsigned int)values->default_item);
                (unsigned int)values->default_item);
-       pb_log("%s: timeout: %u\n", __func__,
+       pb_debug("%s: timeout: %u\n", __func__,
                (unsigned int)values->timeout);
                (unsigned int)values->timeout);
-       pb_log("%s: video_mode:   %u\n", __func__,
+       pb_debug("%s: video_mode:   %u\n", __func__,
                (unsigned int)values->video_mode);
 fail:
        return (result || sum) ? -1 : 0;
                (unsigned int)values->video_mode);
 fail:
        return (result || sum) ? -1 : 0;
@@ -163,8 +163,8 @@ int ps3_flash_set_values(const struct ps3_flash_values *values)
        int result;
        struct ps3_flash_ctx fc;
 
        int result;
        struct ps3_flash_ctx fc;
 
-       pb_log("%s: default_item: %u\n", __func__, values->default_item);
-       pb_log("%s: video_mode:   %u\n", __func__, values->video_mode);
+       pb_debug("%s: default_item: %u\n", __func__, values->default_item);
+       pb_debug("%s: video_mode:   %u\n", __func__, values->video_mode);
 
        result = ps3_flash_open(&fc, "r+");
 
 
        result = ps3_flash_open(&fc, "r+");
 
@@ -245,7 +245,7 @@ static int ps3_video_ioctl(int request, unsigned int *mode_id)
 
 int ps3_set_video_mode(unsigned int mode_id)
 {
 
 int ps3_set_video_mode(unsigned int mode_id)
 {
-       pb_log("%s: %u\n", __func__, mode_id);
+       pb_debug("%s: %u\n", __func__, mode_id);
        return ps3_video_ioctl(PS3FB_IOCTL_SETMODE, &mode_id);
 }
 
        return ps3_video_ioctl(PS3FB_IOCTL_SETMODE, &mode_id);
 }
 
index da97fd9b21ae9e2e1f0bfcf61d470935bd3f4afe..e02c6a66b2a19669a9d6de229a18ee348a2069ed 100644 (file)
@@ -60,7 +60,7 @@ void cui_abort(struct cui *cui)
 
 void cui_resize(struct cui *cui)
 {
 
 void cui_resize(struct cui *cui)
 {
-       pb_log("%s: resizing\n", __func__);
+       pb_debug("%s: resizing\n", __func__);
        cui->resize = 1;
 }
 
        cui->resize = 1;
 }
 
@@ -112,7 +112,7 @@ static int cui_boot(struct pmenu_item *item)
 
        assert(cui->current == &cui->main->scr);
 
 
        assert(cui->current == &cui->main->scr);
 
-       pb_log("%s: %s\n", __func__, cod->name);
+       pb_debug("%s: %s\n", __func__, cod->name);
 
        nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
 
        nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
@@ -302,7 +302,7 @@ static void cui_handle_resize(struct cui *cui)
                return;
        }
 
                return;
        }
 
-       pb_log("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col);
+       pb_debug("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col);
 
        wclear(cui->current->main_ncw);
        resize_term(ws.ws_row, ws.ws_col);
 
        wclear(cui->current->main_ncw);
        resize_term(ws.ws_row, ws.ws_col);
@@ -331,7 +331,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
        ITEM *selected;
        int result;
 
        ITEM *selected;
        int result;
 
-       pb_log("%s: %p %s\n", __func__, opt, opt->id);
+       pb_debug("%s: %p %s\n", __func__, opt, opt->id);
 
        selected = current_item(cui->main->ncm);
 
 
        selected = current_item(cui->main->ncm);
 
index 3b7bc88e8992d3a358355bf9a502c12fb9e723ec..4beffb069c73842b1895109591a308436e2ec978 100644 (file)
@@ -114,26 +114,18 @@ static inline struct pmenu *pmenu_from_scr(struct nc_scr *scr)
 
 /* debug routines */
 
 
 /* debug routines */
 
-#if defined(DEBUG)
-enum {do_debug = 1};
-#else
-enum {do_debug = 0};
-#endif
-
 static inline void pmenu_dump_item(const ITEM *item)
 {
 static inline void pmenu_dump_item(const ITEM *item)
 {
-       if (do_debug)
-               pb_log("%p %s\n", item, (item ? item->name.str : "(null)"));
+       pb_debug("%p %s\n", item, (item ? item->name.str : "(null)"));
 }
 
 static inline void pmenu_dump_items(ITEM *const *items, unsigned int count)
 {
        unsigned int i;
 
 }
 
 static inline void pmenu_dump_items(ITEM *const *items, unsigned int count)
 {
        unsigned int i;
 
-       if (do_debug)
-               for (i = 0; i < count; i++)
-                       pb_log("%u: %p %s\n", i, items[i],
-                               (items[i] ? items[i]->name.str : "(null)"));
+       for (i = 0; i < count; i++)
+               pb_debug("%u: %p %s\n", i, items[i],
+                       (items[i] ? items[i]->name.str : "(null)"));
 }
 
 #endif
 }
 
 #endif
index 298aa7d2f44b5dc1f0f8aad8fe7cd1f31a8abe65..9f80e65c1462727718d03a4b1456110a14f0e332 100644 (file)
 #  error "Curses header file not found."
 #endif
 
 #  error "Curses header file not found."
 #endif
 
-#ifdef DEBUG
-#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args)
+#define DBG(fmt, args...) pb_debug("DBG: " fmt, ## args)
 #define DBGS(fmt, args...) \
 #define DBGS(fmt, args...) \
-       pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
-#else
-#define DBG(fmt, args...)
-#define DBGS(fmt, args...)
-#endif
+       pb_debug("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
 
 
 enum pb_nc_sig {
 
 
 enum pb_nc_sig {
index c4a3892887b3f212130b9a630c5aa91b329d451d..1269549b7f8ac13a5dbff83b581d2d64a74f8ef2 100644 (file)
@@ -275,7 +275,7 @@ static int ps3_boot_cb(struct cui *cui, struct cui_opt_data *cod)
        int altered_args;
        char *orig_args;
 
        int altered_args;
        char *orig_args;
 
-       pb_log("%s: %s\n", __func__, cod->name);
+       pb_debug("%s: %s\n", __func__, cod->name);
 
        assert(ps3->cui->current == &ps3->cui->main->scr);
 
 
        assert(ps3->cui->current == &ps3->cui->main->scr);
 
index 649ad00121c800cb57a98d9c58ba71bbe760712f..2301e31c3cbaa6dfe4201ca33d932858563f0480 100644 (file)
@@ -58,7 +58,7 @@ static int edit_preferences_cb(struct pbt_item *item)
 
        (void)client;
 
 
        (void)client;
 
-       pb_log("%s: TODO\n", __func__);
+       pb_debug("%s: TODO\n", __func__);
 
        return 0;
 }
 
        return 0;
 }
index dba61108fea6df7e137527aa0ee6229f900e5855..21ed52441bfddf6dc368d7779d89332e9c6d3931 100644 (file)
@@ -58,7 +58,7 @@ static int pbt_client_boot(struct pbt_item *item)
        int result;
        struct pb_opt_data *opt_data = pbt_opt_data_from_item(item);
 
        int result;
        struct pb_opt_data *opt_data = pbt_opt_data_from_item(item);
 
-       pb_log("%s: %s\n", __func__, pbt_item_name(item));
+       pb_debug("%s: %s\n", __func__, pbt_item_name(item));
 
        pbt_frame_status_printf(&item->pbt_client->frame, "Booting %s...",
                pbt_item_name(item));
 
        pbt_frame_status_printf(&item->pbt_client->frame, "Booting %s...",
                pbt_item_name(item));
@@ -88,7 +88,7 @@ static int pbt_device_add(struct device *dev, struct pbt_client *client)
        struct pbt_quad q;
        const char *icon_file;
 
        struct pbt_quad q;
        const char *icon_file;
 
-       pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
+       pb_debug("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
                dev->n_options);
 
        pb_protocol_dump_device(dev, "", pb_log_get_stream());
                dev->n_options);
 
        pb_protocol_dump_device(dev, "", pb_log_get_stream());
@@ -181,7 +181,7 @@ static void pbt_device_remove(struct device *dev, struct pbt_client *client)
        struct pbt_item *next_item;
        struct pbt_item *i;
 
        struct pbt_item *next_item;
        struct pbt_item *i;
 
-       pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
+       pb_debug("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
                dev->n_options);
 
        pb_protocol_dump_device(dev, "", pb_log_get_stream());
                dev->n_options);
 
        pb_protocol_dump_device(dev, "", pb_log_get_stream());
@@ -245,7 +245,7 @@ static struct discover_client_ops pbt_client_ops = {
 
 static void pbt_client_destructor(struct pbt_client *client)
 {
 
 static void pbt_client_destructor(struct pbt_client *client)
 {
-       pb_log("%s\n", __func__);
+       pb_debug("%s\n", __func__);
 
        // move to screen twin_x11_destroy(twin_ctx);
        talloc_free(client->discover_client);
 
        // move to screen twin_x11_destroy(twin_ctx);
        talloc_free(client->discover_client);
index e093c3c66b13fcc28defaa3d8b882a3d8d746511..79f6792e346d33d1ff6c786fffd11a400aa9cd0e 100644 (file)
@@ -361,7 +361,7 @@ static int pbt_twin_waiter_cb(struct pbt_twin_ctx *twin_ctx)
 
 static void pbt_scr_destructor(struct pbt_scr *scr)
 {
 
 static void pbt_scr_destructor(struct pbt_scr *scr)
 {
-       pb_log("%s\n", __func__);
+       pb_debug("%s\n", __func__);
 
        twin_x11_destroy(scr->twin_ctx.x11);
        // FIXME: need cursor cleanup???
 
        twin_x11_destroy(scr->twin_ctx.x11);
        // FIXME: need cursor cleanup???
@@ -409,7 +409,7 @@ struct pbt_scr *pbt_scr_init(void *talloc_ctx,
                        goto fail_ctx_create;
                }
 
                        goto fail_ctx_create;
                }
 
-               pb_log("%s: x11: %p\n", __func__, scr->twin_ctx.x11);
+               pb_debug("%s: x11: %p\n", __func__, scr->twin_ctx.x11);
 
                assert(scr->twin_ctx.x11->screen);
                scr->tscreen = scr->twin_ctx.x11->screen;
 
                assert(scr->twin_ctx.x11->screen);
                scr->tscreen = scr->twin_ctx.x11->screen;
index 1198a5924bf59722d0791412a186b7f08b863a97..2880ee1e2dc6ad25ed8be5e2f238038178008c3d 100644 (file)
@@ -33,9 +33,9 @@
 # include <libtwin/twin_fbdev.h>
 #endif
 
 # include <libtwin/twin_fbdev.h>
 #endif
 
-#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args)
+#define DBG(fmt, args...) pb_debug("DBG: " fmt, ## args)
 #define DBGS(fmt, args...) \
 #define DBGS(fmt, args...) \
-       pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
+       pb_debug("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
 
 struct pbt_quad {
        twin_coord_t x;
 
 struct pbt_quad {
        twin_coord_t x;