Right now, it's a wrapper for akaros_printf(). Shortly, glibc's printf will do the same thing that akaros_printf() does, so we can just call it directly.
Signed-off-by: Barret Rhoden <[email protected]> --- user/parlib/debug.c | 12 ------------ user/parlib/include/stdio.h | 1 - user/parlib/panic.c | 4 ++-- user/parlib/vcore.c | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/user/parlib/debug.c b/user/parlib/debug.c index 671e1303939e..ddb3c97b3a55 100644 --- a/user/parlib/debug.c +++ b/user/parlib/debug.c @@ -46,18 +46,6 @@ int ros_vdebug(const char *fmt, va_list ap) return b.cnt; } -int ros_debug(const char *fmt, ...) -{ - va_list ap; - int cnt; - - va_start(ap, fmt); - cnt = ros_vdebug(fmt, ap); - va_end(ap); - - return cnt; -} - int akaros_printf(const char *format, ...) { va_list ap; diff --git a/user/parlib/include/stdio.h b/user/parlib/include/stdio.h index 60b83ef16b73..45bea7a52c9a 100644 --- a/user/parlib/include/stdio.h +++ b/user/parlib/include/stdio.h @@ -19,7 +19,6 @@ void ros_debugfmt(void (*putch)(int, void**), void **putdat, const char *fmt, ...); void ros_vdebugfmt(void (*putch)(int, void**), void **putdat, const char *fmt, va_list); -int ros_debug(const char *fmt, ...); int ros_vdebug(const char *fmt, va_list); #ifdef PRINTD_DEBUG diff --git a/user/parlib/panic.c b/user/parlib/panic.c index 88eff9228c9a..62bfb504d000 100644 --- a/user/parlib/panic.c +++ b/user/parlib/panic.c @@ -33,7 +33,7 @@ _panic(const char *file, int line, const char *fmt,...) void _assert_failed(const char *file, int line, const char *msg) { - ros_debug("[user] %s:%d, vcore %d, Assertion failed: %s\n", - file, line, vcore_id(), msg); + printf("[user] %s:%d, vcore %d, Assertion failed: %s\n", file, line, + vcore_id(), msg); abort(); } diff --git a/user/parlib/vcore.c b/user/parlib/vcore.c index 680aee208a4e..b1f8aa100c53 100644 --- a/user/parlib/vcore.c +++ b/user/parlib/vcore.c @@ -533,7 +533,7 @@ bool check_vcoreid(const char *str, uint32_t vcoreid) { uint32_t kvcoreid = get_vcoreid(); if (vcoreid != kvcoreid) { - ros_debug("%s: VC %d thought it was VC %d\n", str, kvcoreid, vcoreid); + printf("%s: VC %d thought it was VC %d\n", str, kvcoreid, vcoreid); return FALSE; } return TRUE; -- 2.6.0.rc2.230.g3dd15c0 -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
