xous: implement sender.pid()

This is mostly an implementation detail, but appears to work.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-12-04 22:38:35 +08:00
parent 1fa83d1d94
commit b094f1147b
3 changed files with 107 additions and 78 deletions

View file

@ -7,20 +7,31 @@ pub struct SenderID {
pub sidx: usize, pub sidx: usize,
/// The index into the queue array /// The index into the queue array
pub idx: usize, pub idx: usize,
/// The process ID that sent this message
pid: Option<PID>,
}
impl SenderID {
pub fn new(sidx: usize, idx: usize, pid: Option<PID>) -> Self {
SenderID { sidx, idx, pid }
}
} }
impl From<usize> for SenderID { impl From<usize> for SenderID {
fn from(item: usize) -> SenderID { fn from(item: usize) -> SenderID {
SenderID { SenderID {
sidx: item >> 16, sidx: (item >> 16) & 0xff,
idx: item & 0xffff, idx: item & 0xffff,
pid: PID::new((item >> 24) as u8),
} }
} }
} }
impl Into<usize> for SenderID { impl Into<usize> for SenderID {
fn into(self) -> usize { fn into(self) -> usize {
(self.sidx << 16) | (self.idx & 0xffff) (self.pid.map(|x| x.get() as usize).unwrap_or(0) << 24)
| ((self.sidx << 16) & 0x00ff0000)
| (self.idx & 0xffff)
} }
} }
@ -432,11 +443,8 @@ impl Server {
// "queue_head: ((({}))) queue_tail: ((({}))): {:?} CID: ((({})))", // "queue_head: ((({}))) queue_tail: ((({}))): {:?} CID: ((({})))",
// self.queue_head, self.queue_tail, self.queue[self.queue_tail], sidx // self.queue_head, self.queue_tail, self.queue[self.queue_tail], sidx
// ); // );
let sender = SenderID { use core::convert::TryInto;
idx: self.queue_tail, let mut sender = SenderID::new(sidx, self.queue_tail, None);
sidx,
}
.into();
let (result, response) = match self.queue[self.queue_tail] { let (result, response) = match self.queue[self.queue_tail] {
QueuedMessage::Empty => return None, QueuedMessage::Empty => return None,
QueuedMessage::WaitingReturnMemory(_, _, _, _, _) => return None, QueuedMessage::WaitingReturnMemory(_, _, _, _, _) => return None,
@ -451,18 +459,21 @@ impl Server {
buf_size, buf_size,
offset, offset,
valid, valid,
) => ( ) => {
xous_kernel::MessageEnvelope { sender.pid = PID::new(pid.try_into().unwrap());
sender, (
body: xous_kernel::Message::Borrow(xous_kernel::MemoryMessage { xous_kernel::MessageEnvelope {
id, sender: sender.into(),
buf: MemoryRange::new(buf, buf_size).ok()?, body: xous_kernel::Message::Borrow(xous_kernel::MemoryMessage {
offset: MemorySize::new(offset), id,
valid: MemorySize::new(valid), buf: MemoryRange::new(buf, buf_size).ok()?,
}), offset: MemorySize::new(offset),
}, valid: MemorySize::new(valid),
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size), }),
), },
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size),
)
}
QueuedMessage::MemoryMessageRWLend( QueuedMessage::MemoryMessageRWLend(
pid, pid,
tid, tid,
@ -472,18 +483,21 @@ impl Server {
buf_size, buf_size,
offset, offset,
valid, valid,
) => ( ) => {
xous_kernel::MessageEnvelope { sender.pid = PID::new(pid.try_into().unwrap());
sender, (
body: xous_kernel::Message::MutableBorrow(xous_kernel::MemoryMessage { xous_kernel::MessageEnvelope {
id, sender: sender.into(),
buf: MemoryRange::new(buf, buf_size).ok()?, body: xous_kernel::Message::MutableBorrow(xous_kernel::MemoryMessage {
offset: MemorySize::new(offset), id,
valid: MemorySize::new(valid), buf: MemoryRange::new(buf, buf_size).ok()?,
}), offset: MemorySize::new(offset),
}, valid: MemorySize::new(valid),
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size), }),
), },
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size),
)
}
QueuedMessage::MemoryMessageROLendTerminated( QueuedMessage::MemoryMessageROLendTerminated(
pid, pid,
tid, tid,
@ -493,18 +507,21 @@ impl Server {
buf_size, buf_size,
offset, offset,
valid, valid,
) => ( ) => {
xous_kernel::MessageEnvelope { sender.pid = PID::new(pid.try_into().unwrap());
sender, (
body: xous_kernel::Message::Borrow(xous_kernel::MemoryMessage { xous_kernel::MessageEnvelope {
id, sender: sender.into(),
buf: MemoryRange::new(buf, buf_size).ok()?, body: xous_kernel::Message::Borrow(xous_kernel::MemoryMessage {
offset: MemorySize::new(offset), id,
valid: MemorySize::new(valid), buf: MemoryRange::new(buf, buf_size).ok()?,
}), offset: MemorySize::new(offset),
}, valid: MemorySize::new(valid),
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size), }),
), },
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size),
)
}
QueuedMessage::MemoryMessageRWLendTerminated( QueuedMessage::MemoryMessageRWLendTerminated(
pid, pid,
tid, tid,
@ -514,18 +531,21 @@ impl Server {
buf_size, buf_size,
offset, offset,
valid, valid,
) => ( ) => {
xous_kernel::MessageEnvelope { sender.pid = PID::new(pid.try_into().unwrap());
sender, (
body: xous_kernel::Message::MutableBorrow(xous_kernel::MemoryMessage { xous_kernel::MessageEnvelope {
id, sender: sender.into(),
buf: MemoryRange::new(buf, buf_size).ok()?, body: xous_kernel::Message::MutableBorrow(xous_kernel::MemoryMessage {
offset: MemorySize::new(offset), id,
valid: MemorySize::new(valid), buf: MemoryRange::new(buf, buf_size).ok()?,
}), offset: MemorySize::new(offset),
}, valid: MemorySize::new(valid),
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size), }),
), },
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size),
)
}
QueuedMessage::BlockingScalarMessage( QueuedMessage::BlockingScalarMessage(
pid, pid,
@ -536,21 +556,24 @@ impl Server {
arg2, arg2,
arg3, arg3,
arg4, arg4,
) => ( ) => {
xous_kernel::MessageEnvelope { sender.pid = PID::new(pid.try_into().unwrap());
sender, (
body: xous_kernel::Message::BlockingScalar(xous_kernel::ScalarMessage { xous_kernel::MessageEnvelope {
id, sender: sender.into(),
arg1, body: xous_kernel::Message::BlockingScalar(xous_kernel::ScalarMessage {
arg2, id,
arg3, arg1,
arg4, arg2,
}), arg3,
}, arg4,
QueuedMessage::WaitingReturnScalar(pid, tid, client_addr), }),
), },
QueuedMessage::WaitingReturnScalar(pid, tid, client_addr),
)
}
QueuedMessage::MemoryMessageSend( QueuedMessage::MemoryMessageSend(
_pid, pid,
_tid, _tid,
_reserved, _reserved,
id, id,
@ -559,8 +582,9 @@ impl Server {
offset, offset,
valid, valid,
) => { ) => {
sender.pid = PID::new(pid.try_into().unwrap());
let msg = xous_kernel::MessageEnvelope { let msg = xous_kernel::MessageEnvelope {
sender, sender: sender.into(),
body: xous_kernel::Message::Move(xous_kernel::MemoryMessage { body: xous_kernel::Message::Move(xous_kernel::MemoryMessage {
id, id,
buf: MemoryRange::new(buf, buf_size).ok()?, buf: MemoryRange::new(buf, buf_size).ok()?,
@ -577,9 +601,10 @@ impl Server {
} }
// Scalar messages have nothing to return, so they can go straight to the `Free` state // Scalar messages have nothing to return, so they can go straight to the `Free` state
QueuedMessage::ScalarMessage(_pid, _tid, _reserved, id, arg1, arg2, arg3, arg4) => { QueuedMessage::ScalarMessage(pid, _tid, _reserved, id, arg1, arg2, arg3, arg4) => {
sender.pid = PID::new(pid.try_into().unwrap());
let msg = xous_kernel::MessageEnvelope { let msg = xous_kernel::MessageEnvelope {
sender, sender: sender.into(),
body: xous_kernel::Message::Scalar(xous_kernel::ScalarMessage { body: xous_kernel::Message::Scalar(xous_kernel::ScalarMessage {
id, id,
arg1, arg1,
@ -596,7 +621,7 @@ impl Server {
return Some(msg); return Some(msg);
} }
QueuedMessage::BlockingScalarTerminated( QueuedMessage::BlockingScalarTerminated(
_pid, pid,
_tid, _tid,
_reserved, _reserved,
id, id,
@ -605,8 +630,9 @@ impl Server {
arg3, arg3,
arg4, arg4,
) => { ) => {
sender.pid = PID::new(pid.try_into().unwrap());
let msg = xous_kernel::MessageEnvelope { let msg = xous_kernel::MessageEnvelope {
sender, sender: sender.into(),
body: xous_kernel::Message::Scalar(xous_kernel::ScalarMessage { body: xous_kernel::Message::Scalar(xous_kernel::ScalarMessage {
id, id,
arg1, arg1,

View file

@ -147,10 +147,7 @@ fn send_message(pid: PID, thread: TID, cid: CID, message: Message) -> SysCallRes
} else { } else {
0 0
}; };
let sender = SenderID { let sender = SenderID::new(sidx, sender_idx, Some(pid));
sidx,
idx: sender_idx,
};
klog!( klog!(
"server connection data: sidx: {}, idx: {}, server pid: {}", "server connection data: sidx: {}, idx: {}, server pid: {}",
sidx, sidx,

View file

@ -18,9 +18,15 @@ impl MessageSender {
pub fn to_usize(&self) -> usize { pub fn to_usize(&self) -> usize {
self.data self.data
} }
pub fn from_usize(data: usize) -> Self { pub fn from_usize(data: usize) -> Self {
MessageSender { data } MessageSender { data }
} }
pub fn pid(&self) -> Option<PID> {
let pid_u8 = ((self.data >> 24) & 0xff) as u8;
PID::new(pid_u8)
}
} }
impl core::default::Default for MessageSender { impl core::default::Default for MessageSender {