From 41b308f43e54380158f223a2a826f07cac1f476f Mon Sep 17 00:00:00 2001
From: Aren Elchinyan <a2.dev@yandex.ru>
Date: Tue, 31 Oct 2023 19:09:32 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=86=D0=B8=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D1=83=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B8=D0=BD=D0=B0=D0=BC=D0=B8=D1=87?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=BE=D0=B9=20=D0=BF=D0=B0=D0=BC=D1=8F=D1=82?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/mem.c | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/kernel/mem.c b/kernel/mem.c
index ceaed22..6a3b151 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -64,12 +64,33 @@ void mem_dump_memory( ) {
 	mem_entry_t *curr = first_node;
 
 	while (curr) {
-		LOG("->0x%x | %u.%u kb | %u | 0x%x\n", &curr->data, (curr->size) / 1024,
-		    (curr->size) % 1024, curr->free, curr->next);
+		LOG("->0x%x | %u.%u kb | %s | 0x%x\n", &curr->data, (curr->size) / 1024,
+		    (curr->size) % 1024, curr->free ? memory_types[0] : memory_types[1],
+		    curr->next);
 		curr = curr->next;
 	}
 }
 
+void mem_check_dynamic_memory( ) {
+	mem_entry_t *curr = first_node;
+	uint64_t free_mem = 0;
+
+	while (curr) {
+		if (curr->free) { free_mem += curr->size; }
+		curr = curr->next;
+	}
+
+	if (free_mem < 1024 * BLOCK_SIZE) {
+		void *ptr = mem_frame_alloc(1024);
+		if (ptr == NULL) {
+			LOG("Память кончилась!\n");
+			return;
+		}
+		mem_add_block(ptr, 1024 * BLOCK_SIZE);
+		mem_merge_all_blocks( );
+	}
+}
+
 void mem_frame_free(void *addr, uint64_t frames) {
 	// Проход по фреймам памяти и очистка битов в битовой карте
 	uint64_t frame = (uint64_t)addr / BLOCK_SIZE;
@@ -126,7 +147,7 @@ void mem_merge_all_blocks( ) {
 	}
 }
 
-static void add_block(void *addr, size_t size) {
+void mem_add_block(void *addr, size_t size) {
 	mem_entry_t *new_entry = (mem_entry_t *)addr;
 
 	new_entry->size = size - sizeof(mem_entry_t);
@@ -187,6 +208,7 @@ static void *alloc_align(size_t size, size_t alignment) {
 }
 
 void *mem_alloc(size_t size) {
+	mem_check_dynamic_memory( );
 	return alloc_align(size, 1);
 }
 
@@ -231,7 +253,7 @@ void mem_init( ) {
 	LOG("Записей в карте памяти: %u\n", memmap_response->entry_count);
 
 	// Обработка каждой записи в карте памяти
-	for (int i = 0; i < mmmap_count; i++) {
+	for (uint64_t i = 0; i < mmmap_count; i++) {
 		available += mmaps[i]->length;
 
 		// LOG("\t%d: 0x%x\tдлина: 0x%x\tтип: %s\n", i + 1,
@@ -285,7 +307,7 @@ void mem_init( ) {
 	LOG("%u мегабайт выделено в динамичную память\n",
 	    (256 * 16 * BLOCK_SIZE + BLOCK_SIZE) / 1024 / 1024);
 	for (uint64_t i = 256 * 16; i > 0; i -= BLOCK_SIZE) {
-		add_block(mem_frame_alloc(1024), 1024 * BLOCK_SIZE);
+		mem_add_block(mem_frame_alloc(1024), 1024 * BLOCK_SIZE);
 	}
 	mem_merge_all_blocks( );
 	mem_dump_memory( );