Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-26 02:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust error messages

Browse Source
This commit is contained in:
Ruihan Li
2024-09-01 21:08:21 +08:00
committed by Tate, Hongliang Tian
parent 6151d65cf5
commit 0a053404b9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/src/fs/epoll/epoll_file.rs
View File

@ -88,7 +88,10 @@ impl EpollFile {
let mut interest = self.interest.lock(); let mut interest = self.interest.lock();
if interest.contains(&EpollEntryKey::from((fd, &file))) { if interest.contains(&EpollEntryKey::from((fd, &file))) {
return_errno_with_message!(Errno::EEXIST, "the fd has been added"); return_errno_with_message!(
Errno::EEXIST,
"the file is already in the interest list"
);
} }
let entry = EpollEntry::new(fd, &file, ep_event, ep_flags, self.weak_self.clone())?; let entry = EpollEntry::new(fd, &file, ep_event, ep_flags, self.weak_self.clone())?;
@ -122,7 +125,7 @@ impl EpollFile {
.lock() .lock()
.remove(&EpollEntryKey::from((fd, file))) .remove(&EpollEntryKey::from((fd, file)))
{ {
return_errno_with_message!(Errno::ENOENT, "fd is not in the interest list"); return_errno_with_message!(Errno::ENOENT, "the file is not in the interest list");
} }
Ok(()) Ok(())
@ -144,7 +147,7 @@ impl EpollFile {
let EpollEntryHolder(entry) = interest let EpollEntryHolder(entry) = interest
.get(&EpollEntryKey::from((fd, &file))) .get(&EpollEntryKey::from((fd, &file)))
.ok_or_else(|| { .ok_or_else(|| {
Error::with_message(Errno::ENOENT, "fd is not in the interest list") Error::with_message(Errno::ENOENT, "the file is not in the interest list")
})?; })?;
entry.update(new_ep_event, new_ep_flags)?; entry.update(new_ep_event, new_ep_flags)?;
@ -209,7 +212,8 @@ impl EpollFile {
ready.push_back(Arc::downgrade(&entry)); ready.push_back(Arc::downgrade(&entry));
} }
// Even if the entry is already set to ready, there might be new events that we are interested in. // Even if the entry is already set to ready,
// there might be new events that we are interested in.
// Wake the poller anyway. // Wake the poller anyway.
self.pollee.add_events(IoEvents::IN); self.pollee.add_events(IoEvents::IN);
} }