From a0de7f803403a8b8dcb8aa019a3af4aeb5186cf6 Mon Sep 17 00:00:00 2001
From: Aren Elchinyan <a2.dev@yandex.ru>
Date: Wed, 29 Nov 2023 00:33:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=9E=D0=97=D0=A3=20=D0=BF=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6=D0=B5=D1=80=20=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BC=D0=B8=D1=87=D0=BD=D0=BE=D0=B9=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BC=D1=8F=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Теперь он потребляет все 16 мегабайт вместо 4
---
 include/version.h |  2 +-
 kernel/mem.c      | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/version.h b/include/version.h
index 1fd17b3..9a20103 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 1
-#define VERSION_BUILD 742
+#define VERSION_BUILD 758
diff --git a/kernel/mem.c b/kernel/mem.c
index 0ccc5bf..08b606e 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -64,8 +64,8 @@ void mem_dump_memory( ) {
 	mem_entry_t *curr = first_node;
 
 	while (curr) {
-		fb_printf("->0x%x | %u.%u kb | %s | 0x%x\n", &curr->data,
-		          (curr->size) / 1024, (curr->size) % 1024,
+		fb_printf("->0x%x | %u kb | %s | 0x%x\n", &curr->data,
+		          (curr->size) / 1024,
 		          curr->free ? memory_types[0] : memory_types[1], curr->next);
 		curr = curr->next;
 	}
@@ -308,7 +308,10 @@ void mem_init( ) {
 	alloc_init(mem_frame_alloc(1), BLOCK_SIZE);
 	LOG("%u мегабайт выделено в динамичную память\n",
 	    (256 * 16 * BLOCK_SIZE + BLOCK_SIZE) / 1024 / 1024);
-	for (uint64_t i = 256 * 16; i > 0; i -= BLOCK_SIZE) {
+	
+	// Выделяем по 4 мегабайта в аллокатор динамичной памяти
+	for (int64_t i = 0; i < 16; i += 4) {
+		//fb_printf("%d/%u\n", i, 16);
 		mem_add_block(mem_frame_alloc(1024), 1024 * BLOCK_SIZE);
 	}
 	mem_merge_all_blocks( );
@@ -317,5 +320,4 @@ void mem_init( ) {
 	    (bitmap_available * BLOCK_SIZE) / 1024 / 1024, available / 1024 / 1024);
 
 	LOG("%u / %u блоков доступно\n", bitmap_available, bitmap_limit);
-	LOG("Проверка менеджера памяти\n");
 }
\ No newline at end of file