Revert "Only send events that were asked for"

This reverts commit 438acd7d09.

Apparently the test I wrote passes anyway with the old code.
I assume the kernel is filtering the events out.
This commit is contained in:
jD91mZM2
2018-06-03 17:22:39 +02:00
parent 438acd7d09
commit 879bbf0dad
2 changed files with 20 additions and 34 deletions
+2 -22
View File
@@ -22,6 +22,8 @@ fn dup(file: &File, buf: &str) -> io::Result<File> {
fn main() -> io::Result<()> {
let server = File::create("chan:hello_world")?;
println!("Testing events...");
nonblock(&server)?;
let mut event_file = File::open("event:")?;
@@ -35,8 +37,6 @@ fn main() -> io::Result<()> {
time_file.write(&time)?;
time.tv_sec += 2;
time_file.write(&time)?;
time.tv_sec += 1;
time_file.write(&time)?;
const TOKEN_TIMER: usize = 0;
const TOKEN_STREAM: usize = 1;
@@ -56,8 +56,6 @@ fn main() -> io::Result<()> {
let mut event = syscall::Event::default();
println!("Testing accept events...");
event_file.read(&mut event)?;
assert_eq!(event.data, TOKEN_TIMER);
assert_eq!(event.flags, syscall::EVENT_READ);
@@ -75,8 +73,6 @@ fn main() -> io::Result<()> {
assert_eq!(event.flags, syscall::EVENT_WRITE);
println!("-> Accept event");
println!("Testing write events...");
let mut stream = dup(&server, "listen")?;
event_file.read(&mut event)?;
@@ -100,8 +96,6 @@ fn main() -> io::Result<()> {
assert_eq!(event.flags, syscall::EVENT_READ);
println!("-> Timed out");
println!("Testing read events...");
client.write(b"a")?;
let mut buf = [0; 5];
@@ -136,20 +130,6 @@ fn main() -> io::Result<()> {
assert_eq!(event.data, TOKEN_TIMER);
println!("-> Timed out");
println!("Testing no events...");
event_file.write(&syscall::Event {
id: server.as_raw_fd(),
flags: 0,
data: TOKEN_SERVER
})?;
let _client = File::open("chan:hello_world")?;
event_file.read(&mut event)?;
assert_eq!(event.data, TOKEN_TIMER);
println!("-> Timed out");
println!("Everything tested!");
Ok(())
}