diff --git a/bsd/porting/synch.cc b/bsd/porting/synch.cc index d2a19fc37dccf21cce983e0f1c45386c4ee65666..52b6f59398eed328d582ce8bdd1a6f4b08159a40 100644 --- a/bsd/porting/synch.cc +++ b/bsd/porting/synch.cc @@ -5,7 +5,7 @@ #include "sched.hh" #define SYNCH_LOG(...) \ - logger::instance()->log("bsd-synch", logger_error, __VA_ARGS__) + logger::instance()->wrt("bsd-synch", logger_error, __VA_ARGS__) extern "C" { #include <bsd/porting/netport.h> diff --git a/core/debug.cc b/core/debug.cc index 9ef205a70df3bb5773df5e1faacf55562794ada6..e01c5cf193609d3d68edc966b4409ab137ffa729 100644 --- a/core/debug.cc +++ b/core/debug.cc @@ -34,6 +34,7 @@ bool logger::parse_configuration(void) add_tag("tst-eventlist", logger_none); add_tag("tst-rwlock", logger_none); add_tag("tst-bsd-netdriver", logger_debug); + add_tag("tst-virtionet", logger_debug); return (true); } @@ -95,7 +96,7 @@ const char* logger::loggable_severity(logger_severity severity) return (ret); } -void logger::log(const char* tag, logger_severity severity, const boost::format& _fmt) +void logger::wrt(const char* tag, logger_severity severity, const boost::format& _fmt) { if (this->is_filtered(tag, severity)) { return; @@ -106,15 +107,15 @@ void logger::log(const char* tag, logger_severity severity, const boost::format& debug(_fmt, true); } -void logger::log(const char* tag, logger_severity severity, const char* _fmt, ...) +void logger::wrt(const char* tag, logger_severity severity, const char* _fmt, ...) { va_list ap; va_start(ap, _fmt); - this->log(tag, severity, _fmt, ap); + this->wrt(tag, severity, _fmt, ap); va_end(ap); } -void logger::log(const char* tag, logger_severity severity, const char* _fmt, va_list ap) +void logger::wrt(const char* tag, logger_severity severity, const char* _fmt, va_list ap) { if (this->is_filtered(tag, severity)) { return; @@ -131,7 +132,7 @@ void tprintf(const char* tag, logger_severity severity, const char* _fmt, ...) { va_list ap; va_start(ap, _fmt); - logger::instance()->log(tag, severity, _fmt, ap); + logger::instance()->wrt(tag, severity, _fmt, ap); va_end(ap); } } diff --git a/drivers/pci.hh b/drivers/pci.hh index 7258e7697f52a288eb9d9f397a56c445b790bb6a..7a823710c54b406bd3b9731cb1eba910f18e01ba 100644 --- a/drivers/pci.hh +++ b/drivers/pci.hh @@ -35,10 +35,10 @@ class Driver; #define pci_tag "pci" -#define pci_d(fmt) logger::instance()->log(pci_tag, logger_debug, (fmt)) -#define pci_i(fmt) logger::instance()->log(pci_tag, logger_info, (fmt)) -#define pci_w(fmt) logger::instance()->log(pci_tag, logger_warn, (fmt)) -#define pci_e(fmt) logger::instance()->log(pci_tag, logger_error, (fmt)) +#define pci_d(fmt) logger::instance()->wrt(pci_tag, logger_debug, (fmt)) +#define pci_i(fmt) logger::instance()->wrt(pci_tag, logger_info, (fmt)) +#define pci_w(fmt) logger::instance()->wrt(pci_tag, logger_warn, (fmt)) +#define pci_e(fmt) logger::instance()->wrt(pci_tag, logger_error, (fmt)) namespace pci { diff --git a/drivers/virtio-vring.hh b/drivers/virtio-vring.hh index c962f5cfb44bfcca4ea24732d587a5e2170d0c03..8b932ed6d11ccc6354f65ed088b7a0e04b41819f 100644 --- a/drivers/virtio-vring.hh +++ b/drivers/virtio-vring.hh @@ -8,10 +8,10 @@ class sglist; #define virtio_tag "virtio" -#define virtio_d(fmt) logger::instance()->log(virtio_tag, logger_debug, (fmt)) -#define virtio_i(fmt) logger::instance()->log(virtio_tag, logger_info, (fmt)) -#define virtio_w(fmt) logger::instance()->log(virtio_tag, logger_warn, (fmt)) -#define virtio_e(fmt) logger::instance()->log(virtio_tag, logger_error, (fmt)) +#define virtio_d(fmt) logger::instance()->wrt(virtio_tag, logger_debug, (fmt)) +#define virtio_i(fmt) logger::instance()->wrt(virtio_tag, logger_info, (fmt)) +#define virtio_w(fmt) logger::instance()->wrt(virtio_tag, logger_warn, (fmt)) +#define virtio_e(fmt) logger::instance()->wrt(virtio_tag, logger_error, (fmt)) namespace virtio { diff --git a/include/debug.hh b/include/debug.hh index d10c7dfe6de1f24823c81d31f60c2fc6e026ca30..14bed471582e95f77e83fdfe0b49f9a0038d618b 100644 --- a/include/debug.hh +++ b/include/debug.hh @@ -29,9 +29,9 @@ public: // Interface for logging, these functions checks the filters and // calls the underlying debug functions. // - void log(const char* tag, logger_severity severity, const boost::format& _fmt); - void log(const char* tag, logger_severity severity, const char* _fmt, ...); - void log(const char* tag, logger_severity severity, const char* _fmt, va_list ap); + void wrt(const char* tag, logger_severity severity, const boost::format& _fmt); + void wrt(const char* tag, logger_severity severity, const char* _fmt, ...); + void wrt(const char* tag, logger_severity severity, const char* _fmt, va_list ap); private: static logger* _instance; diff --git a/tests/tst-bsd-synch.hh b/tests/tst-bsd-synch.hh index e615f6f61e7925348d2a87eeac352ae8794cb8f4..1f314dbf86f41033f1c12cc3060496d92ee600bf 100644 --- a/tests/tst-bsd-synch.hh +++ b/tests/tst-bsd-synch.hh @@ -10,7 +10,7 @@ extern "C" { } #define dbg_d(...) \ - logger::instance()->log("tst-synch", logger_error, __VA_ARGS__) + logger::instance()->wrt("tst-synch", logger_error, __VA_ARGS__) #undef log diff --git a/tests/tst-eventlist.hh b/tests/tst-eventlist.hh index cf3bba119ab418c71450e7d7465456dbc3ae4f33..43708da3246f56015e89b9037d6c3007cde4f223 100644 --- a/tests/tst-eventlist.hh +++ b/tests/tst-eventlist.hh @@ -5,7 +5,7 @@ #include "debug.hh" #include "tst-hub.hh" -#define dbg_d(fmt) logger::instance()->log("tst-eventlist", logger_debug, (fmt)) +#define dbg_d(fmt) logger::instance()->wrt("tst-eventlist", logger_debug, (fmt)) class test_eventlist : public unit_tests::vtest { public: diff --git a/tests/tst-rwlock.hh b/tests/tst-rwlock.hh index a00c577029e7e6820307f36e8db01f169d28c92e..78c0c17d164ed39768a619221ef7ffbb8ee5d0ed 100644 --- a/tests/tst-rwlock.hh +++ b/tests/tst-rwlock.hh @@ -21,7 +21,7 @@ extern "C" { #define rw_tag "tst-rwlock" #define rw_d(...) \ - logger::instance()->log(rw_tag, logger_debug, __VA_ARGS__) + logger::instance()->wrt(rw_tag, logger_debug, __VA_ARGS__) /* netport.h has an implementation for log(...) */ #undef log