Converting pids into a new type ContextId
Keeping pid (and file descriptor, and scheme id, ...) as usize is a footgun. Let's remove it.
This commit is contained in:
parent
d16515ea12
commit
37a34ab7f7
10 changed files with 52 additions and 44 deletions
|
@ -9,6 +9,10 @@ use context::memory::{Grant, Memory, SharedMemory, Tls};
|
|||
use syscall::data::Event;
|
||||
use sync::{WaitMap, WaitQueue};
|
||||
|
||||
/// Unique identifier for a context (i.e. `pid`).
|
||||
use ::core::sync::atomic::AtomicUsize;
|
||||
int_like!(ContextId, AtomicContextId, usize, AtomicUsize);
|
||||
|
||||
/// The status of a context - used for scheduling
|
||||
/// See syscall::process::waitpid and the sync module for examples of usage
|
||||
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
||||
|
@ -22,9 +26,9 @@ pub enum Status {
|
|||
#[derive(Debug)]
|
||||
pub struct Context {
|
||||
/// The ID of this context
|
||||
pub id: usize,
|
||||
pub id: ContextId,
|
||||
/// The ID of the parent context
|
||||
pub ppid: usize,
|
||||
pub ppid: ContextId,
|
||||
/// The real user id
|
||||
pub ruid: u32,
|
||||
/// The real group id
|
||||
|
@ -42,7 +46,7 @@ pub struct Context {
|
|||
/// Context is halting parent
|
||||
pub vfork: bool,
|
||||
/// Context is being waited on
|
||||
pub waitpid: Arc<WaitMap<usize, usize>>,
|
||||
pub waitpid: Arc<WaitMap<ContextId, usize>>,
|
||||
/// Context should wake up at specified time
|
||||
pub wake: Option<(u64, u64)>,
|
||||
/// The architecture specific context
|
||||
|
@ -75,10 +79,10 @@ pub struct Context {
|
|||
|
||||
impl Context {
|
||||
/// Create a new context
|
||||
pub fn new(id: usize) -> Context {
|
||||
pub fn new(id: ContextId) -> Context {
|
||||
Context {
|
||||
id: id,
|
||||
ppid: 0,
|
||||
ppid: ContextId::from(0),
|
||||
ruid: 0,
|
||||
rgid: 0,
|
||||
euid: 0,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue