Add close to FileIO

src/api/fs.rs

@@ -12,6 +12,7 @@ pub use crate::sys::fs::{FileInfo, DeviceType};
 pub trait FileIO {
  fn read(&mut self, buf: &mut [u8]) -> Result<usize, ()>;
  fn write(&mut self, buf: &[u8]) -> Result<usize, ()>;
+ fn close(&mut self);
 }
 
 pub fn dirname(pathname: &str) -> &str {

src/sys/clock.rs

@@ -31,9 +31,13 @@ impl FileIO for Uptime {
  Err(())
  }
  }
+
  fn write(&mut self, _buf: &[u8]) -> Result<usize, ()> {
  unimplemented!();
  }
+
+ fn close(&mut self) {
+ }
 }
 
 // NOTE: This clock is monotonic
@@ -65,9 +69,13 @@ impl FileIO for Realtime {
  Err(())
  }
  }
+
  fn write(&mut self, _buf: &[u8]) -> Result<usize, ()> {
  unimplemented!();
  }
+
+ fn close(&mut self) {
+ }
 }
 
 // NOTE: This clock is not monotonic

src/sys/cmos.rs

@@ -83,6 +83,9 @@ impl FileIO for RTC {
  CMOS::new().update_rtc(self);
  Ok(buf.len())
  }
+
+ fn close(&mut self) {
+ }
 }
 
 pub struct CMOS {

src/sys/console.rs

@@ -43,6 +43,9 @@ impl FileIO for Console {
  print_fmt(format_args!("{}", s));
  Ok(n)
  }
+
+ fn close(&mut self) {
+ }
 }
 
 pub fn cols() -> usize {

src/sys/fs/device.rs

@@ -128,4 +128,17 @@ impl FileIO for Device {
  Device::TcpSocket(io) => io.write(buf),
  }
  }
+
+ fn close(&mut self) {
+ match self {
+ Device::Null => {},
+ Device::File(io) => io.close(),
+ Device::Console(io) => io.close(),
+ Device::Random(io) => io.close(),
+ Device::Uptime(io) => io.close(),
+ Device::Realtime(io) => io.close(),
+ Device::RTC(io) => io.close(),
+ Device::TcpSocket(io) => io.close(),
+ }
+ }
 }

src/sys/fs/dir.rs

@@ -239,9 +239,13 @@ impl FileIO for Dir {
  }
  Ok(i)
  }
+
  fn write(&mut self, _buf: &[u8]) -> Result<usize, ()> {
  Err(())
  }
+
+ fn close(&mut self) {
+ }
 }
 
 // Truncate to the given number of bytes at most while respecting char boundaries

src/sys/fs/file.rs

@@ -199,6 +199,9 @@ impl FileIO for File {
  }
  Ok(bytes)
  }
+
+ fn close(&mut self) {
+ }
 }
 
 #[test_case]

src/sys/fs/mod.rs

@@ -122,6 +122,14 @@ impl FileIO for Resource {
  Resource::Device(io) => io.write(buf),
  }
  }
+
+ fn close(&mut self) {
+ match self {
+ Resource::Dir(io) => io.close(),
+ Resource::File(io) => io.close(),
+ Resource::Device(io) => io.close(),
+ }
+ }
 }
 
 pub fn canonicalize(path: &str) -> Result<String, ()> {

src/sys/net/mod.rs

@@ -406,6 +406,28 @@ impl FileIO for TcpSocket {
  Err(())
  }
  }
+
+ fn close(&mut self) {
+ let mut closed = false;
+ if let Some((ref mut iface, ref mut device)) = *sys::net::NET.lock() {
+ let mut sockets = SOCKETS.lock();
+ loop {
+ iface.poll(time(), device, &mut sockets);
+ let socket = sockets.get_mut::<tcp::Socket>(self.handle);
+
+ if closed {
+ break;
+ }
+ socket.close();
+ closed = true;
+
+ if let Some(duration) = iface.poll_delay(time(), &sockets) {
+ wait(duration);
+ }
+ sys::time::halt();
+ }
+ }
+ }
 }
 
 fn find_pci_io_base(vendor_id: u16, device_id: u16) -> Option<u16> {

src/sys/random.rs

@@ -22,9 +22,13 @@ impl FileIO for Random {
  }
  Ok(n)
  }
+
  fn write(&mut self, _buf: &[u8]) -> Result<usize, ()> {
  unimplemented!();
  }
+
+ fn close(&mut self) {
+ }
 }
 
 pub fn get_u64() -> u64 {

src/sys/syscall/service.rs

@@ -81,7 +81,10 @@ pub fn write(handle: usize, buf: &mut [u8]) -> isize {
 }
 
 pub fn close(handle: usize) {
- sys::process::delete_file_handle(handle);
+ if let Some(mut file) = sys::process::file_handle(handle) {
+ file.close();
+ sys::process::delete_file_handle(handle);
+ }
 }
 
 pub fn spawn(path: &str, args_ptr: usize, args_len: usize) -> ExitCode {