[catpowder] Enhancement: Improve XDP LibOS

microsoft · Jul 8, 2024 · 0939093 · 0939093
1 parent 0b0b411
commit 0939093
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/rust/catpowder/mod.rs b/src/rust/catpowder/mod.rs
@@ -5,10 +5,10 @@
 mod win;
 
 #[cfg(target_os = "windows")]
-pub use win::runtime::CatpowderRuntime;
+pub use win::runtime::SharedCatpowderRuntime;
 
 #[cfg(target_os = "linux")]
 mod linux;
 
 #[cfg(target_os = "linux")]
-pub use linux::LinuxRuntime as CatpowderRuntime;
+pub use linux::LinuxRuntime as SharedCatpowderRuntime;
diff --git a/src/rust/catpowder/win/runtime.rs b/src/rust/catpowder/win/runtime.rs
@@ -43,7 +43,7 @@ use ::std::borrow::{
 
 /// A LibOS built on top of Windows XDP.
 #[derive(Clone)]
-pub struct CatpowderRuntime(SharedObject<CatpowderRuntimeInner>);
+pub struct SharedCatpowderRuntime(SharedObject<CatpowderRuntimeInner>);
 
 /// The inner state of the Catpowder runtime.
 struct CatpowderRuntimeInner {
@@ -54,7 +54,7 @@ struct CatpowderRuntimeInner {
 //======================================================================================================================
 // Implementations
 //======================================================================================================================
-impl CatpowderRuntime {
+impl SharedCatpowderRuntime {
     ///
     /// Number of buffers in the rings.
     ///
@@ -64,7 +64,7 @@ impl CatpowderRuntime {
     const RING_LENGTH: u32 = 1;
 }
 
-impl NetworkRuntime for CatpowderRuntime {
+impl NetworkRuntime for SharedCatpowderRuntime {
     /// Instantiates a new XDP runtime.
     fn new(config: &Config) -> Result<Self, Fail> {
         let ifindex: u32 = config.local_interface_index()?;
@@ -167,7 +167,7 @@ impl CatpowderRuntimeInner {
 //======================================================================================================================
 
 /// Memory runtime trait implementation for XDP Runtime.
-impl MemoryRuntime for CatpowderRuntime {}
+impl MemoryRuntime for SharedCatpowderRuntime {}
 
 /// Runtime trait implementation for XDP Runtime.
-impl Runtime for CatpowderRuntime {}
+impl Runtime for SharedCatpowderRuntime {}
diff --git a/src/rust/demikernel/libos/mod.rs b/src/rust/demikernel/libos/mod.rs
@@ -22,7 +22,7 @@ use self::name::LibOSName;
 #[cfg(feature = "catnip-libos")]
 use crate::catnip::runtime::SharedDPDKRuntime;
 #[cfg(feature = "catpowder-libos")]
-use crate::catpowder::CatpowderRuntime;
+use crate::catpowder::SharedCatpowderRuntime;
 #[cfg(any(
     feature = "catnap-libos",
     feature = "catnip-libos",
@@ -142,12 +142,12 @@ impl LibOS {
             #[cfg(feature = "catpowder-libos")]
             LibOSName::Catpowder => {
                 // TODO: Remove some of these clones once we are done merging the libOSes.
-                let transport: CatpowderRuntime = CatpowderRuntime::new(&config)?;
+                let transport: SharedCatpowderRuntime = SharedCatpowderRuntime::new(&config)?;
                 // This is our transport for Catpowder.
-                let inetstack: SharedInetStack<CatpowderRuntime> =
-                    SharedInetStack::<CatpowderRuntime>::new(&config, runtime.clone(), transport).unwrap();
+                let inetstack: SharedInetStack<SharedCatpowderRuntime> =
+                    SharedInetStack::<SharedCatpowderRuntime>::new(&config, runtime.clone(), transport).unwrap();
                 Self::NetworkLibOS(NetworkLibOSWrapper::Catpowder(SharedNetworkLibOS::<
-                    SharedInetStack<CatpowderRuntime>,
+                    SharedInetStack<SharedCatpowderRuntime>,
                 >::new(
                     config.local_ipv4_addr()?,
                     runtime.clone(),

diff --git a/src/rust/demikernel/libos/network/mod.rs b/src/rust/demikernel/libos/network/mod.rs
@@ -44,7 +44,7 @@ use crate::catnap::transport::SharedCatnapTransport;
 #[cfg(feature = "catnip-libos")]
 use crate::catnip::runtime::SharedDPDKRuntime;
 #[cfg(feature = "catpowder-libos")]
-use crate::catpowder::CatpowderRuntime;
+use crate::catpowder::SharedCatpowderRuntime;
 
 //======================================================================================================================
 // Structures
@@ -53,7 +53,7 @@ use crate::catpowder::CatpowderRuntime;
 /// Network LIBOS.
 pub enum NetworkLibOSWrapper {
     #[cfg(feature = "catpowder-libos")]
-    Catpowder(SharedNetworkLibOS<SharedInetStack<CatpowderRuntime>>),
+    Catpowder(SharedNetworkLibOS<SharedInetStack<SharedCatpowderRuntime>>),
     #[cfg(all(feature = "catnap-libos"))]
     Catnap(SharedNetworkLibOS<SharedCatnapTransport>),
     #[cfg(feature = "catnip-libos")]