diff options
| author | Miguel <m.i@gmx.at> | 2018-09-21 03:14:52 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-21 03:14:52 +0200 |
| commit | d4bc2ecdd1d0b3d3f3642a5f02840d1e0cb5e199 (patch) | |
| tree | 076ecc41b928c057a6c10df6508237961d714958 /kernel | |
| parent | ace0646608c393d8952b14536090c302bed2ee85 (diff) | |
piper works so nice
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kernel.h | 2 | ||||
| -rw-r--r-- | kernel/scheduler.c | 4 | ||||
| -rw-r--r-- | kernel/syscalls.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/kernel/kernel.h b/kernel/kernel.h index 5f21bc6..e52bcf3 100644 --- a/kernel/kernel.h +++ b/kernel/kernel.h @@ -34,7 +34,7 @@ REFERENCES #define FIFO_MAX_RINGBUFFERS 20 #define MAX_FIFOS 20 #define MAX_FD 20 -#define MAX_TASKS 10 +#define MAX_TASKS 100 #define MEM_PRINT_MEMORYMAP #define KMALLOC_MEM_SIZE 1024*1024*8 // 8MB for in kernel-memory diff --git a/kernel/scheduler.c b/kernel/scheduler.c index 56f6bbc..c13fd4e 100644 --- a/kernel/scheduler.c +++ b/kernel/scheduler.c @@ -295,7 +295,7 @@ void task_syscall_worker() { uint32_t syscall=task_list[cpu][i].eax; - klog("task pid=%d waiting on syscall %d/%s on cpu %d slot %d.",task_list[cpu][i].pid,syscall,syscall_get_name(syscall),cpu,i); +// klog("task pid=%d waiting on syscall %d/%s on cpu %d slot %d.",task_list[cpu][i].pid,syscall,syscall_get_name(syscall),cpu,i); task_list[cpu][0].vmem=task_list[cpu][i].vmem; // switch syscall worker to pagedir of calling userprog x86_set_page_directory(task_list[cpu][0].vmem); @@ -318,7 +318,7 @@ void task_syscall_worker() task_list[cpu][i].ebx, task_list[cpu][i].pid); - klog("... returned : %d",ret); +// klog("... returned : %d",ret); scheduler_wake_all(); diff --git a/kernel/syscalls.c b/kernel/syscalls.c index ee100e2..edc4751 100644 --- a/kernel/syscalls.c +++ b/kernel/syscalls.c @@ -375,7 +375,6 @@ uint32_t syscall_pipe(uint32_t *addr,int none1, int none2, uint32_t pid) uint32_t syscall_dup2(uint32_t oldfd,int newfd, int none2, uint32_t pid) { - fd_close(&fds[pid][newfd]); fds[pid][newfd]=fd_dupl(&fds[pid][oldfd]); return newfd; } |