Compare commits
10 Commits
11c01ab7f6
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
704fdb301a | ||
|
|
170c29bdb5 | ||
| 3302149422 | |||
| 098fe6b283 | |||
|
|
db0f1a8858 | ||
|
|
403fb5a458 | ||
|
|
da980956cd | ||
| debf37bd26 | |||
| 4d9e71d278 | |||
| 6668e412cc |
@@ -224,13 +224,22 @@ bool send(Vault& v, int pid, const void* sbuffer, size_t ssize, void* rbuffer, s
|
||||
}
|
||||
DBG_VERBOSE << "" << endl;
|
||||
}
|
||||
uint8_t num_pages = (rsize/4096)+1;
|
||||
|
||||
// Kopiere Antwort
|
||||
if (!copy_from_phys(v, msg.ptr, rbuffer, rsize)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
// Kopiere Antwort size kann mehr sein
|
||||
for(uint8_t i=0;i<num_pages;i++){
|
||||
uintptr_t paddr = isMapped(msg.ptr, target_thread->paging_tree->l4); //always page aligned
|
||||
if(rsize-i*4096>4096){ // ganze pages
|
||||
if (!copy_from_phys(v,paddr,(void*)((uintptr_t) rbuffer+ (4096*i)),4096)) {
|
||||
return false;
|
||||
}
|
||||
} else { //teil von pages
|
||||
if (!copy_from_phys(v,paddr,(void*)((uintptr_t)rbuffer+ 4096*i), rsize-i*4096)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
int receive(Vault& v, void* buffer, size_t size) {
|
||||
@@ -247,13 +256,16 @@ int receive(Vault& v, void* buffer, size_t size) {
|
||||
if (ipc == nullptr) return -1;
|
||||
|
||||
size_t copy_len = (size < ipc->size) ? size:ipc->size;
|
||||
// Buffer holen
|
||||
size_t total_len = (Page::offset(ipc->ptr)+copy_len);
|
||||
uint8_t num_pages = (total_len/4096)+1;
|
||||
|
||||
for(uint32_t i=0; i<(copy_len/4096)+1; i++){
|
||||
for(uint32_t i=0; i<num_pages; i++){
|
||||
uintptr_t offset = i==0?Page::offset(ipc->ptr):0; //apply offset only on first page
|
||||
uintptr_t paddr = isMapped((ipc->ptr)+(i*4096), v.thread_list[ipc->pid]->paging_tree->l4);
|
||||
if (!copy_from_phys(v, paddr, buffer, copy_len)) {
|
||||
return -3;
|
||||
}
|
||||
if(total_len - (i*4096) > 4096)
|
||||
copy_from_phys(v, paddr+offset,(void*)((uintptr_t)buffer+i*4096), 4096-offset);
|
||||
else
|
||||
copy_from_phys(v, paddr, (void*)((uintptr_t)buffer+i*4096), total_len - (i*4096)); //last page
|
||||
}
|
||||
|
||||
return ipc->pid;
|
||||
@@ -273,14 +285,13 @@ bool reply(Vault& v, const void* buffer, size_t size) {
|
||||
Thread* other_thread = v.thread_list[ipc->pid];
|
||||
if (other_thread == nullptr) return false;
|
||||
|
||||
uintptr_t phys_ptr = isMapped((uintptr_t)buffer, current_thread->paging_tree->l4 );
|
||||
ipc->ptr = phys_ptr + ((uintptr_t)buffer & 0xFFF);
|
||||
ipc->ptr = (uintptr_t)buffer;
|
||||
ipc->size = size;
|
||||
ipc->pid = current_thread->id;
|
||||
ipc->is_answer = true;
|
||||
|
||||
// Sender aufwecken
|
||||
other_thread->ipc_sem.v(v);
|
||||
other_thread->ipc_sem.v(v);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -6,25 +6,27 @@ char sbuf[8194], rbuf[8194]; // (2 * 4KiB) + 2
|
||||
void main() {
|
||||
fork();
|
||||
fork();
|
||||
int other = fork();
|
||||
int ppid = sys_getpid();
|
||||
write(1, "app", 3, 0, ppid);
|
||||
//if (ppid == other) { // child
|
||||
// sbuf[0] = 3;
|
||||
// sbuf[8192] = sys_getpid();
|
||||
// sbuf[8193] = 1;
|
||||
// send(other, sbuf, 8193, rbuf, 8193);
|
||||
int other = fork();
|
||||
//write(1, "app", 3, 0, ppid);
|
||||
if (ppid == other) { // child
|
||||
sbuf[0] = 3;
|
||||
sbuf[8192] = sys_getpid();
|
||||
sbuf[8193] = 1;
|
||||
send(other, sbuf, 8193, rbuf, 8193);
|
||||
|
||||
// char msg[] = "REPLY: AA\n";
|
||||
// msg[7] += rbuf[0] + sbuf[8193];
|
||||
// msg[8] += 4 + ppid;
|
||||
// write(0, msg, 10);
|
||||
//} else { // parent
|
||||
// receive(rbuf, 8193);
|
||||
// rbuf[0] = rbuf[0] + rbuf[8192];
|
||||
// rbuf[8193] = 7;
|
||||
// reply(rbuf, 8193);
|
||||
//}
|
||||
char msg[] = "REPLY: AA\n";
|
||||
msg[7] += rbuf[0] + sbuf[8193];
|
||||
msg[8] += 4 + ppid;
|
||||
write(0, msg, 10);
|
||||
} else { // parent
|
||||
// int X = recv(rbuf, 8193);
|
||||
receive(rbuf, 8193);
|
||||
rbuf[0] = rbuf[0] + rbuf[8192];
|
||||
rbuf[8193] = 7;
|
||||
// reply(X,rbuf, 8193);
|
||||
reply(rbuf,8193);
|
||||
}
|
||||
|
||||
sys_exit();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user