From 552662d594a8858db97832b86db4a54a3cfae8f0 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 13 Dec 2017 19:52:06 +0100 Subject: [PATCH] core: omit allocator info at boot time Fixes #2549 --- repos/base-fiasco/src/core/platform.cc | 8 +------ repos/base-foc/src/core/platform.cc | 8 +------ repos/base-hw/src/core/platform.cc | 8 +------ repos/base-nova/src/core/platform.cc | 7 +----- repos/base-okl4/src/core/platform.cc | 7 +----- repos/base-pistachio/src/core/platform.cc | 27 +++-------------------- repos/base-sel4/src/core/platform.cc | 11 --------- 7 files changed, 8 insertions(+), 68 deletions(-) diff --git a/repos/base-fiasco/src/core/platform.cc b/repos/base-fiasco/src/core/platform.cc index 0ecf2cf96..66159c60d 100644 --- a/repos/base-fiasco/src/core/platform.cc +++ b/repos/base-fiasco/src/core/platform.cc @@ -430,13 +430,7 @@ Platform::Platform() : _setup_irq_alloc(); _init_rom_modules(); - log(":ram_alloc: ", _ram_alloc); - log(":region_alloc: ", _region_alloc); - log(":io_mem: ", _io_mem_alloc); - log(":io_port: ", _io_port_alloc); - log(":irq: ", _irq_alloc); - log(":rom_fs: ", _rom_fs); - log(":core ranges: ", _core_address_ranges); + log(_rom_fs); Fiasco::l4_threadid_t myself = Fiasco::l4_myself(); diff --git a/repos/base-foc/src/core/platform.cc b/repos/base-foc/src/core/platform.cc index 3aa925b07..ee1c5c14b 100644 --- a/repos/base-foc/src/core/platform.cc +++ b/repos/base-foc/src/core/platform.cc @@ -432,13 +432,7 @@ Platform::Platform() : _setup_irq_alloc(); _init_rom_modules(); - log(":ram_alloc: ", _ram_alloc); - log(":region_alloc: ", _region_alloc); - log(":io_mem: ", _io_mem_alloc); - log(":io_port: ", _io_port_alloc); - log(":irq: ", _irq_alloc); - log(":rom_fs: ", _rom_fs); - log(":core ranges: ", _core_address_ranges()); + log(_rom_fs); Core_cap_index* pdi = reinterpret_cast(cap_map()->insert(_cap_id_alloc.alloc(), Fiasco::L4_BASE_TASK_CAP)); diff --git a/repos/base-hw/src/core/platform.cc b/repos/base-hw/src/core/platform.cc index cea846bda..4fd5b1bcb 100644 --- a/repos/base-hw/src/core/platform.cc +++ b/repos/base-hw/src/core/platform.cc @@ -158,13 +158,7 @@ Platform::Platform() init_core_log(Core_log_range { core_local_addr, log_size } ); } - /* print ressource summary */ - log(":virt_alloc: ", *_core_mem_alloc.virt_alloc()); - log(":phys_alloc: ", *_core_mem_alloc.phys_alloc()); - log(":io_mem_alloc: ", _io_mem_alloc); - log(":io_port_alloc: ", _io_port_alloc); - log(":irq_alloc: ", _irq_alloc); - log(":rom_fs: ", _rom_fs); + log(_rom_fs); } diff --git a/repos/base-nova/src/core/platform.cc b/repos/base-nova/src/core/platform.cc index 1c6b32ce4..794440409 100644 --- a/repos/base-nova/src/core/platform.cc +++ b/repos/base-nova/src/core/platform.cc @@ -723,12 +723,7 @@ Platform::Platform() : _irq_alloc.add_range(0, hip->sel_gsi); _gsi_base_sel = (hip->mem_desc_offset - hip->cpu_desc_offset) / hip->cpu_desc_size; - if (verbose_boot_info) { - log(":virt_alloc: ", *_core_mem_alloc.virt_alloc()); - log(":phys_alloc: ", *_core_mem_alloc.phys_alloc()); - log(":io_mem_alloc: ", _io_mem_alloc); - log(":rom_fs: ", _rom_fs); - } + log(_rom_fs); /* add capability selector ranges to map */ unsigned const first_index = 0x2000; diff --git a/repos/base-okl4/src/core/platform.cc b/repos/base-okl4/src/core/platform.cc index 3ab0e9fea..e6b772b54 100644 --- a/repos/base-okl4/src/core/platform.cc +++ b/repos/base-okl4/src/core/platform.cc @@ -171,12 +171,7 @@ Platform::Platform() : _vm_start = 0x1000; _vm_size = 0xb0000000 - 0x1000; - log(":phys_alloc: ", *_core_mem_alloc.phys_alloc()); - log(":virt_alloc: ", *_core_mem_alloc.virt_alloc()); - log(":io_mem: ", _io_mem_alloc); - log(":io_port: ", _io_port_alloc); - log(":irq: ", _irq_alloc); - log(":rom_fs: ", _rom_fs); + log(_rom_fs); /* setup task object for core task */ _core_pd = new(core_mem_alloc()) Platform_pd(true); diff --git a/repos/base-pistachio/src/core/platform.cc b/repos/base-pistachio/src/core/platform.cc index 77375373f..2e189de1d 100644 --- a/repos/base-pistachio/src/core/platform.cc +++ b/repos/base-pistachio/src/core/platform.cc @@ -47,9 +47,8 @@ namespace Pistachio { using namespace Genode; -static const bool verbose = true; -static const bool verbose_core_pf = true; -static const bool verbose_region_alloc = false; +static const bool verbose = true; +static const bool verbose_core_pf = true; /*********************************** @@ -287,9 +286,6 @@ static inline void add_region(Region r, Range_allocator &alloc) panic("add_region called with bogus parameters."); } - if (verbose_region_alloc) - log(&alloc, " add: ", r); - /* adjust region */ addr_t start = trunc_page(r.start); addr_t end = round_page(r.end); @@ -306,9 +302,6 @@ static inline void remove_region(Region r, Range_allocator &alloc) if (r.start >= r.end) panic("remove_region called with bogus parameters."); - if (verbose_region_alloc) - log(&alloc, " remove: ", r); - /* adjust region */ addr_t start = trunc_page(r.start); addr_t end = round_page(r.end); @@ -605,21 +598,7 @@ Platform::Platform() : _setup_irq_alloc(); _init_rom_modules(); - /* - * When dumping 'ram_alloc', there are several small blocks in addition - * to the available free memory visible. These small blocks are used to - * hold the meta data for the ROM modules as initialized by - * '_init_rom_modules'. - */ - if (verbose) { - log(":ram_alloc: ", _ram_alloc); - log(":region_alloc: ", _region_alloc); - log(":io_mem: ", _io_mem_alloc); - log(":io_port: ", _io_port_alloc); - log(":irq: ", _irq_alloc); - log(":rom_fs: ", _rom_fs); - log(":core ranges: ", _core_address_ranges); - } + log(_rom_fs); /* * We setup the thread object for thread0 in core task using a diff --git a/repos/base-sel4/src/core/platform.cc b/repos/base-sel4/src/core/platform.cc index 676554785..50a648b3e 100644 --- a/repos/base-sel4/src/core/platform.cc +++ b/repos/base-sel4/src/core/platform.cc @@ -608,17 +608,6 @@ Platform::Platform() init_core_log(Core_log_range { core_local_addr, log_size } ); } - /* - * Log statistics about allocator initialization - */ - if (verbose_boot_info) { - log(":phys_alloc: ", *_core_mem_alloc.phys_alloc()); - log(":unused_phys_alloc:", _unused_phys_alloc); - log(":unused_virt_alloc:", _unused_virt_alloc); - log(":virt_alloc: ", *_core_mem_alloc.virt_alloc()); - log(":io_mem_alloc: ", _io_mem_alloc); - } - _init_rom_modules(); platform_in_construction = nullptr;