remove populate() from topology

Signed-off-by: bg-furiosa <[email protected]>
furiosa-ai · Apr 5, 2024 · aac7640 · aac7640
1 parent a6458c4
commit aac7640
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/device-api/bin/show_topology.rs b/device-api/bin/show_topology.rs
@@ -11,11 +11,7 @@ async fn main() -> Result<(), DeviceError> {
         return Ok(());
     }
 
-    let mut topology = topology::Topology::new();
-    unsafe {
-        topology.populate(devices.clone())?;
-    }
-
+    let topology = topology::Topology::new(devices.clone())?;
     let mut rows = vec![];
     let mut header = vec!["Device".cell().bold(true)];
     for device in devices.iter() {

diff --git a/device-api/src/topology/mod.rs b/device-api/src/topology/mod.rs
@@ -51,18 +51,19 @@ pub struct Topology {
 }
 
 impl Topology {
-    pub fn new() -> Topology {
-        Self {
+    pub fn new(devices: Vec<Device>) -> DeviceResult<Topology> {
+        let mut new_topology = Self {
             hwloc_topology: Box::new(HwlocTopology::new()),
             topology_matrix: BTreeMap::new(),
-        }
-    }
-    pub unsafe fn populate(&mut self, devices: Vec<Device>) -> DeviceResult<()> {
+        };
+
         let keys = devices.iter().map(|d| d.busname().unwrap()).collect();
-        self.populate_with_keys(keys)
+        new_topology.populate_with_keys(keys)?;
+
+        Ok(new_topology)
     }
 
-    unsafe fn populate_with_keys(&mut self, devices: Vec<String>) -> DeviceResult<()> {
+    fn populate_with_keys(&mut self, devices: Vec<String>) -> DeviceResult<()> {
         // Initialize hwloc topology
         self.hwloc_topology.init_topology()?;
 
@@ -79,7 +80,7 @@ impl Topology {
         }
     }
 
-    unsafe fn populate_topology_matrix(&mut self, devices: Vec<String>) -> DeviceResult<()> {
+    fn populate_topology_matrix(&mut self, devices: Vec<String>) -> DeviceResult<()> {
         for i in 0..devices.len() {
             for j in 0..devices.len() {
                 let dev1_bdf = devices.get(i).unwrap().clone();
@@ -99,21 +100,23 @@ impl Topology {
         Ok(())
     }
 
-    unsafe fn search_interconnect(&self, dev1_bdf: &str, dev2_bdf: &str) -> LinkType {
-        if dev1_bdf == dev2_bdf {
-            return LinkTypeSoc;
-        }
+    fn search_interconnect(&self, dev1_bdf: &str, dev2_bdf: &str) -> LinkType {
+        unsafe {
+            if dev1_bdf == dev2_bdf {
+                return LinkTypeSoc;
+            }
 
-        let ancestor_obj = self
-            .hwloc_topology
-            .get_common_ancestor_obj(dev1_bdf, dev2_bdf)
-            .unwrap();
+            let ancestor_obj = self
+                .hwloc_topology
+                .get_common_ancestor_obj(dev1_bdf, dev2_bdf)
+                .unwrap();
 
-        match (*ancestor_obj).type_ {
-            hwloc_obj_type_t_HWLOC_OBJ_MACHINE => LinkTypeInterconnect,
-            hwloc_obj_type_t_HWLOC_OBJ_PACKAGE => LinkTypeCPU,
-            hwloc_obj_type_t_HWLOC_OBJ_BRIDGE => LinkTypeHostBridge,
-            _ => LinkTypeUnknown,
+            match (*ancestor_obj).type_ {
+                hwloc_obj_type_t_HWLOC_OBJ_MACHINE => LinkTypeInterconnect,
+                hwloc_obj_type_t_HWLOC_OBJ_PACKAGE => LinkTypeCPU,
+                hwloc_obj_type_t_HWLOC_OBJ_BRIDGE => LinkTypeHostBridge,
+                _ => LinkTypeUnknown,
+            }
         }
     }