some fixes for ipc
This commit is contained in:
@@ -291,7 +291,7 @@ bool copy_from_phys(Vault& vault, uintptr_t phys_ptr, void* virt_ptr, size_t siz
|
||||
|
||||
size_t offset = Page::offset(phys_ptr);
|
||||
size_t total_size = size + offset;
|
||||
four_lvl_paging_t* search_table = vault.scheduler.active()->paging_tree;
|
||||
four_lvl_paging_t* search_table = vault.scheduler.active()->paging_tree;
|
||||
|
||||
void* virt_addr = getFreeVirtSpace(search_table, (total_size/4096)+1); // page aligned pointer
|
||||
if (virt_addr == nullptr) {
|
||||
@@ -303,7 +303,7 @@ bool copy_from_phys(Vault& vault, uintptr_t phys_ptr, void* virt_ptr, size_t siz
|
||||
}
|
||||
|
||||
memcpy(virt_ptr, (void*)((uintptr_t)(virt_addr)+ (uintptr_t)offset), size);
|
||||
PageFrameAllocator::free((uintptr_t)(virt_addr));
|
||||
setMapping((uintptr_t)(virt_addr), 0, search_table);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -357,8 +357,9 @@ int receive(Vault& v, void* buffer, size_t size) {
|
||||
IpcStruct* ipc = thread->ipc_queue.first();
|
||||
if (ipc == nullptr) return -1;
|
||||
|
||||
size_t copy_len = (size < ipc->size) ? size:ipc->size;
|
||||
// Buffer holen
|
||||
if (!copy_from_phys(v, ipc->ptr, buffer, size)) {
|
||||
if (!copy_from_phys(v, ipc->ptr, buffer, copy_len)) {
|
||||
return -3;
|
||||
}
|
||||
|
||||
@@ -370,6 +371,10 @@ bool reply(Vault& v, const void* buffer, size_t size) {
|
||||
Thread* current_thread = v.scheduler.active();
|
||||
IpcStruct* ipc = current_thread->ipc_queue.dequeue();
|
||||
|
||||
//noting to reply to
|
||||
if(!ipc)
|
||||
return false;
|
||||
|
||||
// if (!ipc || ipc->pid < 0 || static_cast<size_t>(ipc->pid) >= v.thread_count) return false;
|
||||
|
||||
Thread* other_thread = v.thread_list[ipc->pid];
|
||||
|
||||
Reference in New Issue
Block a user