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:
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);
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);
- 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);
}
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);
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);
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);
}
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);
}
#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;
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__);
- 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);
}
- 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);
{
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);
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);
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);
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;
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+");
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);
}
void cui_resize(struct cui *cui)
{
void cui_resize(struct cui *cui)
{
- pb_log("%s: resizing\n", __func__);
+ pb_debug("%s: resizing\n", __func__);
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);
- 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);
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);
-#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)"));
# 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)
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);
- pb_log("%s: TODO\n", __func__);
+ pb_debug("%s: TODO\n", __func__);
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));
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());
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());
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);
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???
- 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;
# 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;