From 5ea59195422e58ca7c93b4dc7d00f00c792ae10e Mon Sep 17 00:00:00 2001
From: Regina König
Date: Tue, 22 Jun 2021 15:20:12 +0200
Subject: Stop printin page alloc information

---
 efi_memtest/OUTPUT/MemtestEfi.lib           | Bin 2575324 -> 2574938 bytes
 efi_memtest/logger_config.h                 |   6 +++++-
 efi_memtest/memtest86+/efi/memory_tables.c  |   3 ++-
 efi_memtest/memtest86+/efi/page_allocator.c |   9 +++++----
 efi_memtest/memtest86+/main.c               |   5 +++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/efi_memtest/OUTPUT/MemtestEfi.lib b/efi_memtest/OUTPUT/MemtestEfi.lib
index 8f8a595..ebea205 100644
Binary files a/efi_memtest/OUTPUT/MemtestEfi.lib and b/efi_memtest/OUTPUT/MemtestEfi.lib differ
diff --git a/efi_memtest/logger_config.h b/efi_memtest/logger_config.h
index 486c89c..97203fa 100644
--- a/efi_memtest/logger_config.h
+++ b/efi_memtest/logger_config.h
@@ -11,6 +11,7 @@ short log_mem_tbl = 0;
 short log_comp_seg = 0;
 short log_print_pmap = 0;
 short log_pmap = 0;
+short log_print_mmap = 0;
 
 // Hardware Information
 short log_mem_ctrl = 0;
@@ -18,4 +19,7 @@ short log_pci_conf = 0;
 short log_dmi = 0;
 
 // Tests
-short log_tst2 = 1;
\ No newline at end of file
+short log_tst2 = 1;
+
+// PAGE ALLOCATION
+short log_page_alloc = 0;
\ No newline at end of file
diff --git a/efi_memtest/memtest86+/efi/memory_tables.c b/efi_memtest/memtest86+/efi/memory_tables.c
index 89f3ad5..70a5106 100644
--- a/efi_memtest/memtest86+/efi/memory_tables.c
+++ b/efi_memtest/memtest86+/efi/memory_tables.c
@@ -10,6 +10,7 @@ extern EFI_SYSTEM_TABLE *gST;
 
 extern short logflag;
 extern short log_mem_tbl;
+extern short log_page_alloc;
 
 const CHAR16 *memory_types[] = 
 {
@@ -124,7 +125,7 @@ int query_memory_table(void) {
         EFI_STATUS status = gST->BootServices->AllocatePages(
         AllocateAddress, EfiBootServicesData, desc->NumberOfPages, (EFI_PHYSICAL_ADDRESS *)desc->PhysicalStart);
 
-        if (logflag) {
+        if (logflag && log_page_alloc) {
           char log[19] = "STATUS = ";
           int length = 9;
           int_to_charr(status, log, &length);
diff --git a/efi_memtest/memtest86+/efi/page_allocator.c b/efi_memtest/memtest86+/efi/page_allocator.c
index 3aa4a55..8ab3a7e 100644
--- a/efi_memtest/memtest86+/efi/page_allocator.c
+++ b/efi_memtest/memtest86+/efi/page_allocator.c
@@ -7,6 +7,7 @@
 
 extern EFI_SYSTEM_TABLE *gST;
 extern short logflag;
+extern short log_page_alloc;
 
 extern struct allocation_map * const alloc_map;
 
@@ -14,7 +15,7 @@ int d_n_c_level = 0;
 
 void print_alloc_map() {
 
-	if (!logflag) return;
+	if (!logflag || !log_page_alloc) return;
 
 	{
 		char log[30] = "alloc_map->length = ";
@@ -110,7 +111,7 @@ void divide_n_conquer_allocation(int page_no, unsigned long *p) {
 
 	if (status != EFI_SUCCESS ) {
 
-		if (logflag) {
+		if (logflag && log_page_alloc) {
 			char log[19] = "STATUS = ";
 			int length = 9;
 			int_to_charr(status, log, &length);
@@ -147,14 +148,14 @@ void divide_n_conquer_allocation(int page_no, unsigned long *p) {
 
 void allocate_pages(int page_no, unsigned long * p) {
 
-	if (logflag) {
+	if (logflag && log_page_alloc) {
         char log[21] = "\npage_no = ";
         int length =  11;
         int_to_charr(page_no, log, &length);
         print_log(log, length);
     }
 
-    if (logflag) {
+    if (logflag && log_page_alloc) {
         char log[24] = "p = ";
         int length =  4;
         int_to_charr((unsigned long) p, log, &length);
diff --git a/efi_memtest/memtest86+/main.c b/efi_memtest/memtest86+/main.c
index 7ea7d66..f02f2c3 100644
--- a/efi_memtest/memtest86+/main.c
+++ b/efi_memtest/memtest86+/main.c
@@ -56,6 +56,7 @@ extern short logflag;
 extern short log_fine;
 extern short log_comp_seg;
 extern short log_print_pmap;
+extern short log_print_mmap;
 
 
 static int	find_ticks_for_test(int test);
@@ -1081,9 +1082,9 @@ int do_test(int my_ord)
 
     if (1 /*pages_allocated == 1*/) {
 
-        print_pmap();
+        if (logflag && log_print_pmap) print_pmap();
 
-        print_map();
+        if (logflag && log_print_mmap) print_map();
 
 
         if (logflag) {
-- 
cgit v1.2.3-55-g7522