Orbital (#16)

* Port previous ethernet scheme

* Add ipd

* Fix initfs rebuilds, use QEMU user networking addresses in ipd

* Add tcp/udp, netutils, dns, and network config

* Add fsync to network driver

* Add dns, router, subnet by default

* Fix e1000 driver. Make ethernet and IP non-blocking to avoid deadlocks

* Add orbital server, WIP

* Add futex

* Add orbutils and orbital

* Update libstd, orbutils, and orbital
Move ANSI key encoding to vesad

* Add orbital assets

* Update orbital

* Update to add login manager

* Add blocking primitives, block for most things except waitpid, update orbital

* Wait in waitpid and IRQ, improvements for other waits

* Fevent in root scheme

* WIP: Switch to using fevent

* Reorganize

* Event based e1000d driver

* Superuser-only access to some network schemes, display, and disk

* Superuser root and irq schemes

* Fix orbital

drivers/e1000d/src/main.rs

@@ -2,13 +2,19 @@
 #![feature(question_mark)]
 
 extern crate dma;
+extern crate event;
 extern crate syscall;
 
+use std::cell::RefCell;
 use std::{env, thread};
 use std::fs::File;
-use std::io::{Read, Write};
+use std::io::{Read, Write, Result};
+use std::os::unix::io::AsRawFd;
+use std::sync::Arc;
 
-use syscall::{iopl, physmap, physunmap, Packet, Scheme, MAP_WRITE};
+use event::EventQueue;
+use syscall::{Packet, Scheme, MAP_WRITE};
+use syscall::error::EWOULDBLOCK;
 
 pub mod device;
 
@@ -23,21 +29,66 @@ fn main() {
 
     thread::spawn(move || {
         unsafe {
-            iopl(3).expect("e1000d: failed to get I/O permission");
+            syscall::iopl(3).expect("e1000d: failed to get I/O permission");
             asm!("cli" :::: "intel", "volatile");
         }
 
-        let address = unsafe { physmap(bar, 128*1024, MAP_WRITE).expect("e1000d: failed to map address") };
+        let socket = Arc::new(RefCell::new(File::create(":network").expect("e1000d: failed to create network scheme")));
+
+        let address = unsafe { syscall::physmap(bar, 128*1024, MAP_WRITE).expect("e1000d: failed to map address") };
         {
-            let mut device = unsafe { device::Intel8254x::new(address, irq).expect("e1000d: failed to allocate device") };
-            let mut socket = File::create(":network").expect("e1000d: failed to create network scheme");
-            loop {
+            let device = Arc::new(unsafe { device::Intel8254x::new(address, irq).expect("e1000d: failed to allocate device") });
+
+            let mut event_queue = EventQueue::<()>::new().expect("e1000d: failed to create event queue");
+
+            let todo = Arc::new(RefCell::new(Vec::<Packet>::new()));
+
+            let device_irq = device.clone();
+            let socket_irq = socket.clone();
+            let todo_irq = todo.clone();
+            let mut irq_file = File::open(format!("irq:{}", irq)).expect("e1000d: failed to open IRQ file");
+            event_queue.add(irq_file.as_raw_fd(), move |_count: usize| -> Result<Option<()>> {
+                let mut irq = [0; 8];
+                irq_file.read(&mut irq)?;
+                if unsafe { device_irq.irq() } {
+                    irq_file.write(&mut irq)?;
+
+                    let mut todo = todo_irq.borrow_mut();
+                    let mut i = 0;
+                    while i < todo.len() {
+                        let a = todo[i].a;
+                        device_irq.handle(&mut todo[i]);
+                        if todo[i].a == (-EWOULDBLOCK) as usize {
+                            todo[i].a = a;
+                            i += 1;
+                        } else {
+                            socket_irq.borrow_mut().write(&mut todo[i])?;
+                            todo.remove(i);
+                        }
+                    }
+                }
+                Ok(None)
+            }).expect("e1000d: failed to catch events on IRQ file");
+
+            let socket_fd = socket.borrow().as_raw_fd();
+            event_queue.add(socket_fd, move |_count: usize| -> Result<Option<()>> {
                 let mut packet = Packet::default();
-                socket.read(&mut packet).expect("e1000d: failed to read network scheme");
+                socket.borrow_mut().read(&mut packet)?;
+
+                let a = packet.a;
                 device.handle(&mut packet);
-                socket.write(&mut packet).expect("e1000d: failed to read network scheme");
-            }
+                if packet.a == (-EWOULDBLOCK) as usize {
+                    packet.a = a;
+                    todo.borrow_mut().push(packet);
+                } else {
+                    socket.borrow_mut().write(&mut packet)?;
+                }
+
+                Ok(None)
+            }).expect("e1000d: failed to catch events on IRQ file");
+
+            event_queue.run().expect("e1000d: failed to handle events");
         }
-        unsafe { let _ = physunmap(address); }
+        unsafe { let _ = syscall::physunmap(address); }
     });
 }