Add fd table to RuntimeImpl and TestRuntime

Author: dlunch

src/runtime.rs

@@ -1,8 +1,8 @@
 mod io;
 
-use alloc::sync::Arc;
+use alloc::{collections::BTreeMap, sync::Arc};
 use core::{
-    sync::atomic::{AtomicU64, Ordering},
+    sync::atomic::{AtomicU64, AtomicUsize, Ordering},
     time::Duration,
 };
 use std::{
@@ -11,7 +11,7 @@ use std::{
     sync::Mutex,
 };
 
-use java_runtime::{File, FileStat, FileType, IOError, IOResult, RT_RUSTJAR, Runtime, SpawnCallback, get_runtime_class_proto};
+use java_runtime::{File, FileDescriptorId, FileStat, FileType, IOError, IOResult, RT_RUSTJAR, Runtime, SpawnCallback, get_runtime_class_proto};
 use jvm::{ClassDefinition, Jvm};
 use jvm_rust::{ArrayClassDefinitionImpl, ClassDefinitionImpl};
 
@@ -57,6 +57,8 @@ where
     T: Sync + Send + Write + 'static,
 {
     stdout: WriteWrapper<T>,
+    file_table: Arc<Mutex<BTreeMap<usize, Box<dyn File>>>>,
+    next_fd: Arc<AtomicUsize>,
 }
 
 impl<T> RuntimeImpl<T>
@@ -68,8 +70,16 @@ where
             stdout: WriteWrapper {
                 write: Arc::new(Mutex::new(stdout)),
             },
+            file_table: Arc::new(Mutex::new(BTreeMap::new())),
+            next_fd: Arc::new(AtomicUsize::new(0)),
         }
     }
+
+    fn register_file(&self, file: Box<dyn File>) -> FileDescriptorId {
+        let fd = self.next_fd.fetch_add(1, Ordering::SeqCst);
+        self.file_table.lock().unwrap().insert(fd, file);
+        FileDescriptorId::new(fd)
+    }
 }
 
 #[async_trait::async_trait]
@@ -104,20 +114,28 @@ where
         TASK_ID.try_with(|x| *x).unwrap_or(0)
     }
 
-    fn stdin(&self) -> IOResult<Box<dyn File>> {
-        Ok(Box::new(InputStreamFile::new(stdin())))
+    fn stdin(&self) -> IOResult<FileDescriptorId> {
+        let file = Box::new(InputStreamFile::new(stdin()));
+        Ok(self.register_file(file))
+    }
+
+    fn stdout(&self) -> IOResult<FileDescriptorId> {
+        let file = Box::new(WriteStreamFile::new(self.stdout.clone()));
+        Ok(self.register_file(file))
     }
 
-    fn stdout(&self) -> IOResult<Box<dyn File>> {
-        Ok(Box::new(WriteStreamFile::new(self.stdout.clone())))
+    fn stderr(&self) -> IOResult<FileDescriptorId> {
+        let file = Box::new(WriteStreamFile::new(stderr()));
+        Ok(self.register_file(file))
     }
 
-    fn stderr(&self) -> IOResult<Box<dyn File>> {
-        Ok(Box::new(WriteStreamFile::new(stderr())))
+    async fn open(&self, path: &str, write: bool) -> IOResult<FileDescriptorId> {
+        let file = Box::new(FileImpl::new(path, write));
+        Ok(self.register_file(file))
     }
 
-    async fn open(&self, path: &str, write: bool) -> IOResult<Box<dyn File>> {
-        Ok(Box::new(FileImpl::new(path, write)))
+    fn get_file(&self, fd: FileDescriptorId) -> IOResult<Box<dyn File>> {
+        self.file_table.lock().unwrap().get(&fd.id()).cloned().ok_or(IOError::NotFound)
     }
 
     async fn unlink(&self, path: &str) -> IOResult<()> {
@@ -166,6 +184,10 @@ where
     T: Sync + Send + Write + 'static,
 {
     fn clone(&self) -> Self {
-        Self { stdout: self.stdout.clone() }
+        Self {
+            stdout: self.stdout.clone(),
+            file_table: self.file_table.clone(),
+            next_fd: self.next_fd.clone(),
+        }
     }
 }

test_utils/src/lib.rs

@@ -1,28 +1,53 @@
 extern crate alloc;
 
-use alloc::{boxed::Box, collections::BTreeMap, string::String, vec::Vec};
+use alloc::{boxed::Box, collections::BTreeMap, string::String, sync::Arc, vec::Vec};
 use core::{
     cmp::min,
-    sync::atomic::{AtomicU64, Ordering},
+    sync::atomic::{AtomicU64, AtomicUsize, Ordering},
     time::Duration,
 };
-use std::time::{SystemTime, UNIX_EPOCH};
+use std::{
+    sync::Mutex,
+    time::{SystemTime, UNIX_EPOCH},
+};
 
 use jvm::{ClassDefinition, Jvm, Result};
 use jvm_rust::{ArrayClassDefinitionImpl, ClassDefinitionImpl};
 
 use java_runtime::{
-    File, FileSize, FileStat, FileType, IOError, IOResult, RT_RUSTJAR, Runtime, SpawnCallback, get_bootstrap_class_loader, get_runtime_class_proto,
+    File, FileDescriptorId, FileSize, FileStat, FileType, IOError, IOResult, RT_RUSTJAR, Runtime, SpawnCallback, get_bootstrap_class_loader,
+    get_runtime_class_proto,
 };
 
-#[derive(Clone)]
 pub struct TestRuntime {
     filesystem: BTreeMap<String, Vec<u8>>,
+    file_table: Arc<Mutex<BTreeMap<usize, Box<dyn File>>>>,
+    next_fd: Arc<AtomicUsize>,
+}
+
+impl Clone for TestRuntime {
+    fn clone(&self) -> Self {
+        Self {
+            filesystem: self.filesystem.clone(),
+            file_table: self.file_table.clone(),
+            next_fd: self.next_fd.clone(),
+        }
+    }
 }
 
 impl TestRuntime {
     pub fn new(filesystem: BTreeMap<String, Vec<u8>>) -> Self {
-        Self { filesystem }
+        Self {
+            filesystem,
+            file_table: Arc::new(Mutex::new(BTreeMap::new())),
+            next_fd: Arc::new(AtomicUsize::new(0)),
+        }
+    }
+
+    fn register_file(&self, file: Box<dyn File>) -> FileDescriptorId {
+        let fd = self.next_fd.fetch_add(1, Ordering::SeqCst);
+        self.file_table.lock().unwrap().insert(fd, file);
+        FileDescriptorId::new(fd)
     }
 }
 
@@ -61,27 +86,32 @@ impl Runtime for TestRuntime {
         TASK_ID.try_with(|x| *x).unwrap_or(0)
     }
 
-    fn stdin(&self) -> IOResult<Box<dyn File>> {
+    fn stdin(&self) -> IOResult<FileDescriptorId> {
         Err(IOError::NotFound)
     }
 
-    fn stdout(&self) -> IOResult<Box<dyn File>> {
+    fn stdout(&self) -> IOResult<FileDescriptorId> {
         Err(IOError::NotFound)
     }
 
-    fn stderr(&self) -> IOResult<Box<dyn File>> {
+    fn stderr(&self) -> IOResult<FileDescriptorId> {
         Err(IOError::NotFound)
     }
 
-    async fn open(&self, path: &str, _write: bool) -> IOResult<Box<dyn File>> {
+    async fn open(&self, path: &str, _write: bool) -> IOResult<FileDescriptorId> {
         let entry = self.filesystem.get(path);
         if let Some(data) = entry {
-            Ok(Box::new(DummyFile::new(data.clone())) as Box<_>)
+            let file = Box::new(DummyFile::new(data.clone())) as Box<dyn File>;
+            Ok(self.register_file(file))
         } else {
             Err(IOError::NotFound)
         }
     }
 
+    fn get_file(&self, fd: FileDescriptorId) -> IOResult<Box<dyn File>> {
+        self.file_table.lock().unwrap().get(&fd.id()).cloned().ok_or(IOError::NotFound)
+    }
+
     async fn unlink(&self, _path: &str) -> IOResult<()> {
         Err(IOError::NotFound)
     }