ejung/bsb2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes for ipc

Browse Source
This commit is contained in:
Eggert Jung
2026-02-24 22:42:41 +01:00
parent e3452cf051
commit a35cc22990
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/syscall/skeleton.cc
View File

@@ -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 offset = Page::offset(phys_ptr);
size_t total_size = size + offset; 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 void* virt_addr = getFreeVirtSpace(search_table, (total_size/4096)+1); // page aligned pointer
if (virt_addr == nullptr) { 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); 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; return true;
} }
@@ -357,8 +357,9 @@ int receive(Vault& v, void* buffer, size_t size) {
IpcStruct* ipc = thread->ipc_queue.first(); IpcStruct* ipc = thread->ipc_queue.first();
if (ipc == nullptr) return -1; if (ipc == nullptr) return -1;
size_t copy_len = (size < ipc->size) ? size:ipc->size;
// Buffer holen // Buffer holen
if (!copy_from_phys(v, ipc->ptr, buffer, size)) { if (!copy_from_phys(v, ipc->ptr, buffer, copy_len)) {
return -3; return -3;
} }
@@ -370,6 +371,10 @@ bool reply(Vault& v, const void* buffer, size_t size) {
Thread* current_thread = v.scheduler.active(); Thread* current_thread = v.scheduler.active();
IpcStruct* ipc = current_thread->ipc_queue.dequeue(); 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; // if (!ipc || ipc->pid < 0 || static_cast<size_t>(ipc->pid) >= v.thread_count) return false;
Thread* other_thread = v.thread_list[ipc->pid]; Thread* other_thread = v.thread_list[ipc->pid];

22
user/app1/appl.cc
View File

@@ -46,22 +46,24 @@ extern "C" void main() {
//sys_test(1,2,3,4,5); //sys_test(1,2,3,4,5);
unsigned id = sys_getpid(); unsigned id = sys_getpid();
char text[] = "appX"; char text[] = "appX ";
text[3] = 0x30+id; text[3] = 0x30+id;
write(1, text, sizeof(text), 0, (int)id); write(1, text, sizeof(text), 0, (int)id);
uint8_t cnt = 0; uint8_t cnt = 0;
for (unsigned i = 1;; ++i) { for (unsigned i = 1;; ++i) {
if(id == 2){ if(i%10 == 0){
send(4, text, strlen(text), text, 5); if(id == 2){
write(1, text, strlen(text), 25, (int)id); send(4, text, strlen(text), text, 5);
} write(1, text, strlen(text), 25, (int)id);
if(id == 4){ }
char blubb[10]; if(id == 4){
receive(blubb, 10); char blubb[10];
write(1, blubb, strlen(blubb), 25, (int)id); receive(blubb, 10);
reply("toast", 5); write(1, blubb, strlen(blubb), 25, (int)id);
reply("toast", 5);
}
} }
//counter to see app running //counter to see app running