TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-18 09:04:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix sbrk

Browse Source
This commit is contained in:
Baptiste Wicht 2016-08-07 11:35:55 +02:00
parent 1783785cba
commit 01adb24aa1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/src/scheduler.cpp
View File

@ -662,13 +662,14 @@ int64_t scheduler::exec(const std::string& file, const std::vector<std::string>&
return process.pid; return process.pid;
} }
//TODO This will not work several times (brk_start/brk_end)
void scheduler::sbrk(size_t inc){ void scheduler::sbrk(size_t inc){
auto& process = pcb[current_pid].process; auto& process = pcb[current_pid].process;
size_t size = (inc + paging::PAGE_SIZE - 1) & ~(paging::PAGE_SIZE - 1); size_t size = (inc + paging::PAGE_SIZE - 1) & ~(paging::PAGE_SIZE - 1);
size_t pages = size / paging::PAGE_SIZE; size_t pages = size / paging::PAGE_SIZE;
logging::logf(logging::log_level::DEBUG, "sbrk: Add %u pages to process %u heap\n", pages, process.pid);
//Get some physical memory //Get some physical memory
auto physical = physical_allocator::allocate(pages); auto physical = physical_allocator::allocate(pages);
@ -676,7 +677,7 @@ void scheduler::sbrk(size_t inc){
return; return;
} }
auto virtual_start = process.brk_start; auto virtual_start = process.brk_end;
logging::logf(logging::log_level::DEBUG, "Map(p%u) virtual:%h into phys: %h\n", process.pid, virtual_start, physical); logging::logf(logging::log_level::DEBUG, "Map(p%u) virtual:%h into phys: %h\n", process.pid, virtual_start, physical);