justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[kernel] Use map for process handles

Browse Source 
Replace linearly-indexed vector of handles with new kutil::map. Also
provide thread::current() and process::current() accessors so that every
syscall doesn't need to include the scheduler to deduce the current
process.
This commit is contained in:
Justin C. Miller
2020-09-13 15:54:47 -07:00
parent 245f260d67
commit 9dee5e4138
6 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/kernel/syscalls/channel.cpp
View File

@@ -2,19 +2,14 @@
#include "j6/types.h"
#include "objects/channel.h"
#include "objects/thread.h"
#include "objects/process.h"
#include "scheduler.h"
namespace syscalls {
j6_status_t
channel_create(j6_handle_t *handle)
{
scheduler &s = scheduler::get();
TCB *tcb = s.current();
thread *parent = thread::from_tcb(tcb);
process &p = parent->parent();
process &p = process::current();
channel *c = new channel;
*handle = p.add_handle(c);
@@ -25,10 +20,7 @@ channel_create(j6_handle_t *handle)
j6_status_t
channel_close(j6_handle_t handle)
{
scheduler &s = scheduler::get();
TCB *tcb = s.current();
thread *parent = thread::from_tcb(tcb);
process &p = parent->parent();
process &p = process::current();
kobject *o = p.lookup_handle(handle);
if (!o || o->get_type() != kobject::type::channel)
@@ -44,10 +36,7 @@ channel_close(j6_handle_t handle)
j6_status_t
channel_send(j6_handle_t handle, size_t *len, void *data)
{
scheduler &s = scheduler::get();
TCB *tcb = s.current();
thread *parent = thread::from_tcb(tcb);
process &p = parent->parent();
process &p = process::current();
kobject *o = p.lookup_handle(handle);
if (!o || o->get_type() != kobject::type::channel)
@@ -60,10 +49,7 @@ channel_send(j6_handle_t handle, size_t *len, void *data)
j6_status_t
channel_receive(j6_handle_t handle, size_t *len, void *data)
{
scheduler &s = scheduler::get();
TCB *tcb = s.current();
thread *parent = thread::from_tcb(tcb);
process &p = parent->parent();
process &p = process::current();
kobject *o = p.lookup_handle(handle);
if (!o || o->get_type() != kobject::type::channel)

17
src/kernel/syscalls/object.cpp
View File

@@ -13,8 +13,8 @@ j6_status_t
object_wait(j6_handle_t handle, j6_signal_t mask, j6_signal_t *sigs)
{
scheduler &s = scheduler::get();
thread *th = thread::from_tcb(s.current());
process &p = th->parent();
thread &th = thread::current();
process &p = process::current();
kobject *obj = p.lookup_handle(handle);
if (!obj)
@@ -26,13 +26,13 @@ object_wait(j6_handle_t handle, j6_signal_t mask, j6_signal_t *sigs)
return j6_status_ok;
}
obj->add_blocked_thread(th);
th->wait_on_signals(obj, mask);
obj->add_blocked_thread(&th);
th.wait_on_signals(obj, mask);
s.schedule();
j6_status_t result = th->get_wait_result();
j6_status_t result = th.get_wait_result();
if (result == j6_status_ok) {
*sigs = th->get_wait_data();
*sigs = th.get_wait_data();
}
return result;
}
@@ -43,10 +43,7 @@ object_signal(j6_handle_t handle, j6_signal_t signals)
if ((signals & j6_signal_user_mask) != signals)
return j6_err_invalid_arg;
scheduler &s = scheduler::get();
thread *th = thread::from_tcb(s.current());
process &p = th->parent();
process &p = process::current();
kobject *obj = p.lookup_handle(handle);
if (!obj)
return j6_err_invalid_arg;