From b6cb27a875d28cd35b92b6ce5af7467b0f34a8c4 Mon Sep 17 00:00:00 2001 From: Sparchatus Date: Thu, 2 Jun 2022 20:43:17 +0000 Subject: [PATCH] ensure no debug_printf makes it to the output --- hake/hake.sh | 2 +- lib/aos/coreboot.c | 2 +- lib/aos/init.c | 6 +++--- lib/mm/mm.c | 2 +- usr/drivers/enet/enet_module.c | 2 +- usr/init/main.c | 4 ++-- usr/init/mem_alloc.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hake/hake.sh b/hake/hake.sh index b4f8c13..3dbae76 100755 --- a/hake/hake.sh +++ b/hake/hake.sh @@ -16,7 +16,7 @@ DEFAULT_JOBS=4 JOBS="$DEFAULT_JOBS" CACHEDIR="$HOME/.cache/barrelfish" HAGFISH_LOCATION="/home/netos/tftpboot/Hagfish.efi" -DEFAULT_OPT_FLAGS="-O2 -g" +DEFAULT_OPT_FLAGS="-O2 -g -DNDEBUG" # Don't override the default toolchain unless asked to. TOOLROOT=Nothing diff --git a/lib/aos/coreboot.c b/lib/aos/coreboot.c index a473cf5..18a9e47 100644 --- a/lib/aos/coreboot.c +++ b/lib/aos/coreboot.c @@ -377,7 +377,7 @@ errval_t coreboot(coreid_t mpid, // debug_printf("[coreboot]: ARMv8_KERNEL_OFFSET = %p\n", ARMv8_KERNEL_OFFSET); core_data->cpu_driver_entry = reloc_cpudriver_entry + ARMv8_KERNEL_OFFSET; - debug_printf("[coreboot] Flush the cache\n"); + // debug_printf("[coreboot] Flush the cache\n"); // - Flush the cache. //memory barrier diff --git a/lib/aos/init.c b/lib/aos/init.c index a761973..e632c0a 100644 --- a/lib/aos/init.c +++ b/lib/aos/init.c @@ -46,7 +46,7 @@ void libc_exit(int); __weak_reference(libc_exit, _exit); void libc_exit(int status) { - debug_printf("libc exit NYI!\n"); + DEBUG_PRINTF("libc exit NYI!\n"); thread_exit(status); // If we're not dead by now, we wait while (1) {} @@ -110,7 +110,7 @@ static size_t aos_terminal_write(const char *buf, size_t len) struct aos_rpc *rpc = aos_rpc_get_serial_channel(); if (rpc == NULL) { - debug_printf("[aos_terminal_write] RPC NOT YET INITIALIZED: %.*s\n", len, buf); + // debug_printf("[aos_terminal_write] RPC NOT YET INITIALIZED: %.*s\n", len, buf); USER_PANIC("Make sure to initialize aos_rpc before barrelfish_libc_glue_init is called."); } for (int i = 0; i < len; ++i) { @@ -129,7 +129,7 @@ static size_t aos_terminal_read(char *buf, size_t len) struct aos_rpc *rpc = aos_rpc_get_serial_channel(); if (rpc == NULL) { - debug_printf("[aos_terminal_read] RPC NOT YET INITIALIZED: %.*s\n", len, buf); + // debug_printf("[aos_terminal_read] RPC NOT YET INITIALIZED: %.*s\n", len, buf); USER_PANIC("Make sure to initialize aos_rpc before barrelfish_libc_glue_init is called."); } for (int i = 0; i < len; ++i) { diff --git a/lib/mm/mm.c b/lib/mm/mm.c index bc7b2df..1be8027 100644 --- a/lib/mm/mm.c +++ b/lib/mm/mm.c @@ -72,7 +72,7 @@ errval_t mm_add(struct mm *mm, struct capref cap) gensize_t size = get_size(&c); assert(size != 0); - debug_printf("mm_add: adding region. base=%"PRIx64", size=%"PRIx64"\n", base, size); + DEBUG_PRINTF("mm_add: adding region. base=%"PRIx64", size=%"PRIx64"\n", base, size); genpaddr_t base_rounded = ROUND_UP(base, BASE_PAGE_SIZE); gensize_t size_rounded = ROUND_DOWN(size - (base_rounded - base), BASE_PAGE_SIZE); diff --git a/usr/drivers/enet/enet_module.c b/usr/drivers/enet/enet_module.c index e6dd282..dc52277 100644 --- a/usr/drivers/enet/enet_module.c +++ b/usr/drivers/enet/enet_module.c @@ -330,7 +330,7 @@ static errval_t enet_phy_startup(struct enet_driver_state* st) if (!(mii_reg & PHY_STATUS_ANEG_COMP)) { - debug_printf("[enet] Starting autonegotiation \n"); + DEBUG_PRINTF("[enet] Starting autonegotiation \n"); while(!(mii_reg & PHY_STATUS_ANEG_COMP)) { err = enet_read_mdio(st, PHY_ID, PHY_STATUS_CMD, &mii_reg); assert(err_is_ok(err)); diff --git a/usr/init/main.c b/usr/init/main.c index 24a6a4e..cc1c019 100644 --- a/usr/init/main.c +++ b/usr/init/main.c @@ -370,7 +370,7 @@ static int app_main(int argc, char *argv[]) { errval_t err; - debug_printf("[app_main]\n"); + DEBUG_PRINTF("[app_main]\n"); // Implement me in Milestone 5 // Remember to call @@ -524,7 +524,7 @@ int main(int argc, char *argv[]) platform = "UNKNOWN"; } - debug_printf("init domain starting on core %" PRIuCOREID " (%s), invoked as:", my_core_id, platform); + DEBUG_PRINTF("init domain starting on core %" PRIuCOREID " (%s), invoked as:", my_core_id, platform); for (int i = 0; i < argc; i++) { printf(" %s", argv[i]); } diff --git a/usr/init/mem_alloc.c b/usr/init/mem_alloc.c index 48ae4ab..269ec60 100644 --- a/usr/init/mem_alloc.c +++ b/usr/init/mem_alloc.c @@ -107,7 +107,7 @@ errval_t initialize_ram_alloc(void) mem_cap.slot++; } } - debug_printf("Added %"PRIu64" MB of physical memory.\n", mem_avail / 1024 / 1024); + DEBUG_PRINTF("Added %"PRIu64" MB of physical memory.\n", mem_avail / 1024 / 1024); // Grading grading_test_mm(&aos_mm);