summaryrefslogtreecommitdiff
path: root/src/kernel/task
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/task')
-rw-r--r--src/kernel/task/syscall.c24
-rw-r--r--src/kernel/task/task.c11
-rw-r--r--src/kernel/task/task.h3
3 files changed, 3 insertions, 35 deletions
diff --git a/src/kernel/task/syscall.c b/src/kernel/task/syscall.c
index b490987..46ccff6 100644
--- a/src/kernel/task/syscall.c
+++ b/src/kernel/task/syscall.c
@@ -21,18 +21,9 @@ CALL1V(process_exit, process_exit_sc);
CALL1(monitor_write, printk_sc);
CALL1V(idt_waitIrq, irq_wait_sc);
CALL0(proc_priv, proc_priv_sc);
+CALL2(process_setheapseg, proc_setheap_sc);
CALL2(shm_create, shm_create_sc);
CALL1(shm_delete, shm_delete_sc);
-CALL0(object_create, object_create_sc);
-CALL1(object_owned, object_owned_sc);
-CALL1V(object_close, object_close_sc);
-CALL3(request_get, request_get_sc);
-CALL1(request_has, request_has_sc);
-CALL4V(request_answer, request_answer_sc);
-CALL3(request_mapShm, request_mapShm_sc);
-CALL2(request, request_sc);
-CALL2(send_msg, send_msg_sc);
-CALL2(process_setheapseg, proc_setheap_sc);
static void thread_new_sc(struct registers* r) {
thread_new(current_thread->process, (thread_entry)r->ebx, (void*)r->ecx, (void*)r->edx);
@@ -47,16 +38,7 @@ int_callback syscalls[NUMBER_OF_SYSCALLS] = {
thread_new_sc, //5
irq_wait_sc,
proc_priv_sc,
- shm_create_sc,
- shm_delete_sc,
- object_create_sc, //10
- object_owned_sc,
- object_close_sc,
- request_get_sc,
- request_has_sc,
- request_answer_sc, //15
- request_mapShm_sc,
- request_sc,
- send_msg_sc,
proc_setheap_sc,
+ shm_create_sc,
+ shm_delete_sc, //10
0 };
diff --git a/src/kernel/task/task.c b/src/kernel/task/task.c
index b8a72ce..f074c77 100644
--- a/src/kernel/task/task.c
+++ b/src/kernel/task/task.c
@@ -5,13 +5,10 @@
#include <mem/mem.h>
#include <mem/seg.h>
#include <mem/gdt.h>
-#include <ipc/object.h>
#include "timer.h"
#define KSTACKSIZE 0x8000
-static struct object *manager_object = 0;
-
//Static routines for handling threads exiting and all cleanup
static void thread_exit_stackJmp(uint32_t reason);
static void thread_exit2(uint32_t reason);
@@ -294,13 +291,6 @@ struct process *process_new(struct process* parent, uint32_t uid, uint32_t privi
p->stack = stacksBottom + USER_STACK_SIZE - 4;
}
- p->next_objdesc = 0;
- p->objects = 0;
- struct object* o = obj_new(p);
- if (manager_object == 0) manager_object = o;
- objdesc_add(p, o); //create process' root object and add descriptor 0 to it
- objdesc_add(p, manager_object);
-
processes = p;
return p;
}
@@ -332,7 +322,6 @@ static void process_delete(struct process *pr) {
thread_delete(it);
it = it->next;
}
- obj_closeall(pr);
if (processes == pr) {
processes = pr->next;
} else {
diff --git a/src/kernel/task/task.h b/src/kernel/task/task.h
index 171a9fd..fdffa11 100644
--- a/src/kernel/task/task.h
+++ b/src/kernel/task/task.h
@@ -28,9 +28,6 @@ struct process {
struct page_directory *pagedir;
size_t stack;
- struct obj_descriptor *objects;
- uint32_t next_objdesc;
-
struct segment_map *heapseg;
struct process *next; //Forms a linked list