Converting file handles into a new type FileHandle

Keeping file handles (and pids, and scheme id, ...) as usize is a
footgun. Let's remove it.

kernel/context/context.rs

@@ -6,6 +6,7 @@ use spin::Mutex;
 use arch;
 use context::file::File;
 use context::memory::{Grant, Memory, SharedMemory, Tls};
+use scheme::FileHandle;
 use syscall::data::Event;
 use sync::{WaitMap, WaitQueue};
 
@@ -184,28 +185,28 @@ impl Context {
 
     /// Add a file to the lowest available slot.
     /// Return the file descriptor number or None if no slot was found
-    pub fn add_file(&self, file: File) -> Option<usize> {
+    pub fn add_file(&self, file: File) -> Option<FileHandle> {
         let mut files = self.files.lock();
         for (i, mut file_option) in files.iter_mut().enumerate() {
             if file_option.is_none() {
                 *file_option = Some(file);
-                return Some(i);
+                return Some(FileHandle::from(i));
             }
         }
         let len = files.len();
         if len < super::CONTEXT_MAX_FILES {
             files.push(Some(file));
-            Some(len)
+            Some(FileHandle::from(len))
         } else {
             None
         }
     }
 
     /// Get a file
-    pub fn get_file(&self, i: usize) -> Option<File> {
+    pub fn get_file(&self, i: FileHandle) -> Option<File> {
         let files = self.files.lock();
-        if i < files.len() {
-            files[i]
+        if i.into() < files.len() {
+            files[i.into()]
         } else {
             None
         }
@@ -213,10 +214,10 @@ impl Context {
 
     /// Remove a file
     // TODO: adjust files vector to smaller size if possible
-    pub fn remove_file(&self, i: usize) -> Option<File> {
+    pub fn remove_file(&self, i: FileHandle) -> Option<File> {
         let mut files = self.files.lock();
-        if i < files.len() {
-            files[i].take()
+        if i.into() < files.len() {
+            files[i.into()].take()
         } else {
             None
         }

kernel/context/event.rs

@@ -3,7 +3,7 @@ use collections::BTreeMap;
 use spin::{Once, RwLock, RwLockReadGuard, RwLockWriteGuard};
 
 use context;
-use scheme::SchemeId;
+use scheme::{FileHandle, SchemeId};
 use sync::WaitQueue;
 use syscall::data::Event;
 
@@ -18,7 +18,7 @@ pub struct RegKey {
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 pub struct ProcessKey {
     context_id: context::context::ContextId,
-    fd: usize,
+    fd: FileHandle,
 }
 
 type Registry = BTreeMap<RegKey, BTreeMap<ProcessKey, EventList>>;
@@ -40,7 +40,7 @@ pub fn registry_mut() -> RwLockWriteGuard<'static, Registry> {
     REGISTRY.call_once(init_registry).write()
 }
 
-pub fn register(fd: usize, scheme_id: SchemeId, event_id: usize) -> bool {
+pub fn register(fd: FileHandle, scheme_id: SchemeId, event_id: usize) -> bool {
     let (context_id, events) = {
         let contexts = context::contexts();
         let context_lock = contexts.current().expect("event::register: No context");
@@ -67,7 +67,7 @@ pub fn register(fd: usize, scheme_id: SchemeId, event_id: usize) -> bool {
     }
 }
 
-pub fn unregister(fd: usize, scheme_id: SchemeId, event_id: usize) {
+pub fn unregister(fd: FileHandle, scheme_id: SchemeId, event_id: usize) {
     let mut registry = registry_mut();
 
     let mut remove = false;
@@ -102,7 +102,7 @@ pub fn trigger(scheme_id: SchemeId, event_id: usize, flags: usize, data: usize)
         for entry in event_lists.iter() {
             if let Some(event_list) = entry.1.upgrade() {
                 event_list.send(Event {
-                    id: (entry.0).fd,
+                    id: (entry.0).fd.into(),
                     flags: flags,
                     data: data
                 });