mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-16 08:38:26 +00:00
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:
parent
1fa83d1d94
commit
b094f1147b
3 changed files with 107 additions and 78 deletions
|
|
@ -7,20 +7,31 @@ pub struct SenderID {
|
|||
pub sidx: usize,
|
||||
/// The index into the queue array
|
||||
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 {
|
||||
fn from(item: usize) -> SenderID {
|
||||
SenderID {
|
||||
sidx: item >> 16,
|
||||
sidx: (item >> 16) & 0xff,
|
||||
idx: item & 0xffff,
|
||||
pid: PID::new((item >> 24) as u8),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Into<usize> for SenderID {
|
||||
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: ((({})))",
|
||||
// self.queue_head, self.queue_tail, self.queue[self.queue_tail], sidx
|
||||
// );
|
||||
let sender = SenderID {
|
||||
idx: self.queue_tail,
|
||||
sidx,
|
||||
}
|
||||
.into();
|
||||
use core::convert::TryInto;
|
||||
let mut sender = SenderID::new(sidx, self.queue_tail, None);
|
||||
let (result, response) = match self.queue[self.queue_tail] {
|
||||
QueuedMessage::Empty => return None,
|
||||
QueuedMessage::WaitingReturnMemory(_, _, _, _, _) => return None,
|
||||
|
|
@ -451,18 +459,21 @@ impl Server {
|
|||
buf_size,
|
||||
offset,
|
||||
valid,
|
||||
) => (
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender,
|
||||
body: xous_kernel::Message::Borrow(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
buf: MemoryRange::new(buf, buf_size).ok()?,
|
||||
offset: MemorySize::new(offset),
|
||||
valid: MemorySize::new(valid),
|
||||
}),
|
||||
},
|
||||
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size),
|
||||
),
|
||||
) => {
|
||||
sender.pid = PID::new(pid.try_into().unwrap());
|
||||
(
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender: sender.into(),
|
||||
body: xous_kernel::Message::Borrow(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
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::MemoryMessageRWLend(
|
||||
pid,
|
||||
tid,
|
||||
|
|
@ -472,18 +483,21 @@ impl Server {
|
|||
buf_size,
|
||||
offset,
|
||||
valid,
|
||||
) => (
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender,
|
||||
body: xous_kernel::Message::MutableBorrow(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
buf: MemoryRange::new(buf, buf_size).ok()?,
|
||||
offset: MemorySize::new(offset),
|
||||
valid: MemorySize::new(valid),
|
||||
}),
|
||||
},
|
||||
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size),
|
||||
),
|
||||
) => {
|
||||
sender.pid = PID::new(pid.try_into().unwrap());
|
||||
(
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender: sender.into(),
|
||||
body: xous_kernel::Message::MutableBorrow(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
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::MemoryMessageROLendTerminated(
|
||||
pid,
|
||||
tid,
|
||||
|
|
@ -493,18 +507,21 @@ impl Server {
|
|||
buf_size,
|
||||
offset,
|
||||
valid,
|
||||
) => (
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender,
|
||||
body: xous_kernel::Message::Borrow(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
buf: MemoryRange::new(buf, buf_size).ok()?,
|
||||
offset: MemorySize::new(offset),
|
||||
valid: MemorySize::new(valid),
|
||||
}),
|
||||
},
|
||||
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size),
|
||||
),
|
||||
) => {
|
||||
sender.pid = PID::new(pid.try_into().unwrap());
|
||||
(
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender: sender.into(),
|
||||
body: xous_kernel::Message::Borrow(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
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::MemoryMessageRWLendTerminated(
|
||||
pid,
|
||||
tid,
|
||||
|
|
@ -514,18 +531,21 @@ impl Server {
|
|||
buf_size,
|
||||
offset,
|
||||
valid,
|
||||
) => (
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender,
|
||||
body: xous_kernel::Message::MutableBorrow(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
buf: MemoryRange::new(buf, buf_size).ok()?,
|
||||
offset: MemorySize::new(offset),
|
||||
valid: MemorySize::new(valid),
|
||||
}),
|
||||
},
|
||||
QueuedMessage::WaitingReturnMemory(pid, tid, buf, client_addr, buf_size),
|
||||
),
|
||||
) => {
|
||||
sender.pid = PID::new(pid.try_into().unwrap());
|
||||
(
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender: sender.into(),
|
||||
body: xous_kernel::Message::MutableBorrow(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
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::BlockingScalarMessage(
|
||||
pid,
|
||||
|
|
@ -536,21 +556,24 @@ impl Server {
|
|||
arg2,
|
||||
arg3,
|
||||
arg4,
|
||||
) => (
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender,
|
||||
body: xous_kernel::Message::BlockingScalar(xous_kernel::ScalarMessage {
|
||||
id,
|
||||
arg1,
|
||||
arg2,
|
||||
arg3,
|
||||
arg4,
|
||||
}),
|
||||
},
|
||||
QueuedMessage::WaitingReturnScalar(pid, tid, client_addr),
|
||||
),
|
||||
) => {
|
||||
sender.pid = PID::new(pid.try_into().unwrap());
|
||||
(
|
||||
xous_kernel::MessageEnvelope {
|
||||
sender: sender.into(),
|
||||
body: xous_kernel::Message::BlockingScalar(xous_kernel::ScalarMessage {
|
||||
id,
|
||||
arg1,
|
||||
arg2,
|
||||
arg3,
|
||||
arg4,
|
||||
}),
|
||||
},
|
||||
QueuedMessage::WaitingReturnScalar(pid, tid, client_addr),
|
||||
)
|
||||
}
|
||||
QueuedMessage::MemoryMessageSend(
|
||||
_pid,
|
||||
pid,
|
||||
_tid,
|
||||
_reserved,
|
||||
id,
|
||||
|
|
@ -559,8 +582,9 @@ impl Server {
|
|||
offset,
|
||||
valid,
|
||||
) => {
|
||||
sender.pid = PID::new(pid.try_into().unwrap());
|
||||
let msg = xous_kernel::MessageEnvelope {
|
||||
sender,
|
||||
sender: sender.into(),
|
||||
body: xous_kernel::Message::Move(xous_kernel::MemoryMessage {
|
||||
id,
|
||||
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
|
||||
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 {
|
||||
sender,
|
||||
sender: sender.into(),
|
||||
body: xous_kernel::Message::Scalar(xous_kernel::ScalarMessage {
|
||||
id,
|
||||
arg1,
|
||||
|
|
@ -596,7 +621,7 @@ impl Server {
|
|||
return Some(msg);
|
||||
}
|
||||
QueuedMessage::BlockingScalarTerminated(
|
||||
_pid,
|
||||
pid,
|
||||
_tid,
|
||||
_reserved,
|
||||
id,
|
||||
|
|
@ -605,8 +630,9 @@ impl Server {
|
|||
arg3,
|
||||
arg4,
|
||||
) => {
|
||||
sender.pid = PID::new(pid.try_into().unwrap());
|
||||
let msg = xous_kernel::MessageEnvelope {
|
||||
sender,
|
||||
sender: sender.into(),
|
||||
body: xous_kernel::Message::Scalar(xous_kernel::ScalarMessage {
|
||||
id,
|
||||
arg1,
|
||||
|
|
|
|||
|
|
@ -147,10 +147,7 @@ fn send_message(pid: PID, thread: TID, cid: CID, message: Message) -> SysCallRes
|
|||
} else {
|
||||
0
|
||||
};
|
||||
let sender = SenderID {
|
||||
sidx,
|
||||
idx: sender_idx,
|
||||
};
|
||||
let sender = SenderID::new(sidx, sender_idx, Some(pid));
|
||||
klog!(
|
||||
"server connection data: sidx: {}, idx: {}, server pid: {}",
|
||||
sidx,
|
||||
|
|
|
|||
|
|
@ -18,9 +18,15 @@ impl MessageSender {
|
|||
pub fn to_usize(&self) -> usize {
|
||||
self.data
|
||||
}
|
||||
|
||||
pub fn from_usize(data: usize) -> Self {
|
||||
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 {
|
||||
|
|
|
|||
Loading…
Reference in a new issue