tmp

Signed-off-by: danbugs <[email protected]>

Author: danbugs

src/hyperlight_host/src/mem/mgr.rs

@@ -434,151 +434,3 @@ impl SandboxMemoryManager<HostSharedMemory> {
         Ok(vec_out)
     }
 }
-
-// TODO(danbugs:297): bring back
-// #[cfg(test)]
-// mod tests {
-//     #[cfg(all(target_os = "windows", inprocess))]
-//     use serial_test::serial;
-//
-//     #[test]
-//     fn load_guest_binary_common() {
-//         let guests = vec![
-//             rust_guest_as_pathbuf("simpleguest"),
-//             rust_guest_as_pathbuf("callbackguest"),
-//         ];
-//         for guest in guests {
-//             let guest_bytes = bytes_for_path(guest).unwrap();
-//             let exe_info = ExeInfo::from_buf(guest_bytes.as_slice()).unwrap();
-//             let stack_size_override = 0x3000;
-//             let heap_size_override = 0x10000;
-//             let mut cfg = SandboxConfiguration::default();
-//             cfg.set_stack_size(stack_size_override);
-//             cfg.set_heap_size(heap_size_override);
-//             let (layout, shared_mem, _, _) =
-//                 super::load_guest_binary_common(cfg, &exe_info, |_, _| Ok(RawPtr::from(100)))
-//                     .unwrap();
-//             assert_eq!(
-//                 stack_size_override,
-//                 u64::try_from(layout.stack_size).unwrap()
-//             );
-//             assert_eq!(heap_size_override, u64::try_from(layout.heap_size).unwrap());
-//             assert_eq!(layout.get_memory_size().unwrap(), shared_mem.mem_size());
-//         }
-//     }
-//
-//     #[cfg(all(target_os = "windows", inprocess))]
-//     #[test]
-//     #[serial]
-//     fn load_guest_binary_using_load_library() {
-//         use hyperlight_testing::rust_guest_as_pathbuf;
-//
-//         use crate::mem::mgr::SandboxMemoryManager;
-//
-//         let cfg = SandboxConfiguration::default();
-//         let guest_pe_path = rust_guest_as_pathbuf("simpleguest.exe");
-//         let guest_pe_bytes = bytes_for_path(guest_pe_path.clone()).unwrap();
-//         let mut pe_info = ExeInfo::from_buf(guest_pe_bytes.as_slice()).unwrap();
-//         let _ = SandboxMemoryManager::load_guest_binary_using_load_library(
-//             cfg,
-//             guest_pe_path.to_str().unwrap(),
-//             &mut pe_info,
-//         )
-//             .unwrap();
-//
-//         let guest_elf_path = rust_guest_as_pathbuf("simpleguest");
-//         let guest_elf_bytes = bytes_for_path(guest_elf_path.clone()).unwrap();
-//         let mut elf_info = ExeInfo::from_buf(guest_elf_bytes.as_slice()).unwrap();
-//
-//         let res = SandboxMemoryManager::load_guest_binary_using_load_library(
-//             cfg,
-//             guest_elf_path.to_str().unwrap(),
-//             &mut elf_info,
-//         );
-//
-//         match res {
-//             Ok(_) => {
-//                 panic!("loadlib with elf should fail");
-//             }
-//             Err(err) => {
-//                 assert!(err
-//                     .to_string()
-//                     .contains("LoadLibrary can only be used with PE files"));
-//             }
-//         }
-//     }
-//
-//     /// Don't write a host error, try to read it back, and verify we
-//     /// successfully do the read but get no error back
-//     #[test]
-//     fn get_host_error_none() {
-//         let cfg = SandboxConfiguration::default();
-//         let layout = SandboxMemoryLayout::new(cfg, 0x10_000, 0x10_000, 0x10_000, 0x10_000).unwrap();
-//         let mut eshm = ExclusiveSharedMemory::new(layout.get_memory_size().unwrap()).unwrap();
-//         let mem_size = eshm.mem_size();
-//         layout
-//             .write(
-//                 &mut eshm,
-//                 SandboxMemoryLayout::BASE_ADDRESS,
-//                 mem_size,
-//                 false,
-//             )
-//             .unwrap();
-//         let emgr = SandboxMemoryManager::new(
-//             layout,
-//             eshm,
-//             false,
-//             RawPtr::from(0),
-//             Offset::from(0),
-//             #[cfg(target_os = "windows")]
-//             None,
-//         );
-//         let (hmgr, _) = emgr.build();
-//         assert_eq!(None, hmgr.get_host_error().unwrap());
-//     }
-//
-//     /// write a host error to shared memory, then try to read it back out
-//     #[test]
-//     fn round_trip_host_error() {
-//         let cfg = SandboxConfiguration::default();
-//         let layout = SandboxMemoryLayout::new(cfg, 0x10_000, 0x10_000, 0x10_000, 0x10_000).unwrap();
-//         let mem_size = layout.get_memory_size().unwrap();
-//         // write a host error and then try to read it back
-//         let mut eshm = ExclusiveSharedMemory::new(mem_size).unwrap();
-//         layout
-//             .write(
-//                 &mut eshm,
-//                 SandboxMemoryLayout::BASE_ADDRESS,
-//                 mem_size,
-//                 false,
-//             )
-//             .unwrap();
-//         let emgr = SandboxMemoryManager::new(
-//             layout,
-//             eshm,
-//             false,
-//             RawPtr::from(0),
-//             Offset::from(0),
-//             #[cfg(target_os = "windows")]
-//             None,
-//         );
-//         let (mut hmgr, _) = emgr.build();
-//         let err = HyperlightHostError {
-//             message: "test message".to_string(),
-//             source: "rust test".to_string(),
-//         };
-//         let err_json_bytes = {
-//             let str = to_string(&err).unwrap();
-//             str.into_bytes()
-//         };
-//         let err_json_msg = "test error message".to_string().into_bytes();
-//         hmgr.write_outb_error(&err_json_msg, &err_json_bytes)
-//             .unwrap();
-//
-//         let host_err_opt = hmgr
-//             .get_host_error()
-//             .expect("get_host_err should return an Ok");
-//         assert!(host_err_opt.is_some());
-//         assert_eq!(err, host_err_opt.unwrap());
-//     }
-// }

src/hyperlight_host/src/mem/ptr.rs

@@ -27,7 +27,7 @@ use crate::Result;
 ///
 /// Use this type to distinguish between an offset and a raw pointer
 #[derive(Debug, Clone, Eq, PartialEq)]
-// TODO(danbugs:297): we should probably rethink these APIs.
+// TODO(see #429): we should probably rethink these APIs.
 pub struct RawPtr(pub u64);
 
 impl From<u64> for RawPtr {

src/hyperlight_host/src/mem/shared_mem.rs

@@ -688,7 +688,7 @@ pub trait SharedMemory {
     /// Return a readonly reference to the host mapping backing this SharedMemory
     fn region(&self) -> &HostMapping;
 
-    // TODO(danbugs:297) consider how the three functions below fit into the bigger
+    // TODO(see #430) consider how the three functions below fit into the bigger
     // picture w/ implementors of this trait having similar fxns.
     /// Return data as mut slice
     fn as_mut_slice(&mut self) -> &mut [u8] {