christoph/lecture-operating-system-development
1
Fork 0
Code Activity

switch to linkedlistallocator + demo

Browse Source
This commit is contained in:
churl
2022-05-08 15:58:36 +02:00
parent 20f4fa05db
commit 0f1a45af47
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c_os/kernel/Globals.cc
View File

@ -15,5 +15,5 @@ PCSPK pcspk; // PC-Lautsprecher
CGA_Stream kout; // Ausgabe-Strom fuer Kernel CGA_Stream kout; // Ausgabe-Strom fuer Kernel
Keyboard kb; // Tastatur Keyboard kb; // Tastatur
unsigned int total_mem; // RAM total unsigned int total_mem; // RAM total
BumpAllocator allocator; // BumpAllocator allocator;
//LinkedListAllocator allocator; LinkedListAllocator allocator;

5
c_os/kernel/Globals.h
View File

@ -14,6 +14,7 @@
#include "devices/Keyboard.h" #include "devices/Keyboard.h"
#include "devices/PCSPK.h" #include "devices/PCSPK.h"
#include "kernel/allocator/BumpAllocator.h" #include "kernel/allocator/BumpAllocator.h"
#include "kernel/allocator/LinkedListAllocator.h"
#include "kernel/CPU.h" #include "kernel/CPU.h"
extern CPU cpu; // CPU-spezifische Funktionen extern CPU cpu; // CPU-spezifische Funktionen
@ -21,7 +22,7 @@ extern PCSPK pcspk; // PC-Lautsprecher
extern CGA_Stream kout; // Ausgabe-Strom fuer Kernel extern CGA_Stream kout; // Ausgabe-Strom fuer Kernel
extern Keyboard kb; // Tastatur extern Keyboard kb; // Tastatur
extern unsigned int total_mem; // RAM total extern unsigned int total_mem; // RAM total
extern BumpAllocator allocator; // extern BumpAllocator allocator;
//extern LinkedListAllocator allocator; extern LinkedListAllocator allocator;
#endif #endif

5
c_os/user/HeapDemo.cc
View File

@ -32,9 +32,6 @@ void heap_demo() {
MyObj* a = new MyObj(5); MyObj* a = new MyObj(5);
allocator.dump_free_memory(); allocator.dump_free_memory();
MyObj* b = new MyObj(10); allocator.alloc(1024 * 1024 - 16); // should fail as only 1024 * 1024 - (4 + 4) bytes remain
allocator.dump_free_memory();
allocator.alloc(1024 * 1024); // should fail as only 1024 * 1024 - (4 + 4) bytes remain
allocator.dump_free_memory(); allocator.dump_free_memory();
} }