Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/drivers/fs/proc/task/task.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::drivers::fs::proc::task::ProcTaskInode;
use crate::drivers::fs::proc::{get_inode_id, procfs};
use crate::process::thread_group::Tgid;
use crate::process::{TaskDescriptor, Tid, find_task_by_descriptor};
use crate::process::{TaskDescriptor, Tid, find_process_by_tgid, find_task_by_descriptor};
use alloc::boxed::Box;
use alloc::string::ToString;
use alloc::sync::Arc;
Expand Down Expand Up @@ -57,12 +57,10 @@ impl Inode for ProcTaskDirInode {
}

async fn readdir(&self, start_offset: u64) -> libkernel::error::Result<Box<dyn DirStream>> {
let task = find_task_by_descriptor(&TaskDescriptor::from_tgid_tid(
self.tgid,
Tid::from_tgid(self.tgid),
))
.ok_or(FsError::NotFound)?;
let tasks = task.process.tasks.lock_save_irq();
let process = &find_process_by_tgid(self.tgid)
.ok_or(FsError::NotFound)?
.process;
let tasks = process.tasks.lock_save_irq();
let mut entries = Vec::new();
for (i, (_tid, task)) in tasks.iter().enumerate().skip(start_offset as usize) {
let Some(task) = task.upgrade() else {
Expand Down
10 changes: 3 additions & 7 deletions src/memory/process_vm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ use super::{
PageOffsetTranslator,
uaccess::{copy_obj_array_from_user, copy_to_user_slice},
};
use crate::process::find_process_by_tgid;
use crate::{
fs::syscalls::iov::IoVec,
process::{
TaskDescriptor, Tid, find_task_by_descriptor,
thread_group::{Tgid, pid::PidT},
},
process::thread_group::{Tgid, pid::PidT},
};
use libkernel::{
error::{KernelError, Result},
Expand All @@ -25,9 +23,7 @@ pub async fn sys_process_vm_readv(
_flags: usize,
) -> Result<usize> {
let tgid = Tgid::from_pid_t(pid);
let remote_proc =
find_task_by_descriptor(&TaskDescriptor::from_tgid_tid(tgid, Tid::from_tgid(tgid)))
.ok_or(KernelError::NoProcess)?;
let remote_proc = find_process_by_tgid(tgid).ok_or(KernelError::NoProcess)?;
let local_iovs = copy_obj_array_from_user(local_iov, liov_count).await?;
let remote_iovs = copy_obj_array_from_user(remote_iov, riov_count).await?;

Expand Down
5 changes: 5 additions & 0 deletions src/process/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,11 @@ pub fn find_task_by_descriptor(descriptor: &TaskDescriptor) -> Option<Arc<Task>>
.and_then(|x| x.upgrade())
}

/// Finds the root task for the given thread group
pub fn find_process_by_tgid(tgid: Tgid) -> Option<Arc<Task>> {
find_task_by_descriptor(&TaskDescriptor::from_tgid_tid(tgid, Tid::from_tgid(tgid)))
}

pub static TASK_LIST: SpinLock<BTreeMap<TaskDescriptor, Weak<Task>>> =
SpinLock::new(BTreeMap::new());

Expand Down
Loading