From d5098c9e575b7d5447506648ebeae146192eeda1 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Wed, 10 Mar 2021 08:59:08 +0000
Subject: [PATCH] aya: move hash_map.rs to hash_map/hash_map.rs

---
 aya/src/maps/{ => hash_map}/hash_map.rs | 48 +++----------------------
 aya/src/maps/hash_map/mod.rs            | 46 ++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 43 deletions(-)
 rename aya/src/maps/{ => hash_map}/hash_map.rs (92%)
 create mode 100644 aya/src/maps/hash_map/mod.rs

diff --git a/aya/src/maps/hash_map.rs b/aya/src/maps/hash_map/hash_map.rs
similarity index 92%
rename from aya/src/maps/hash_map.rs
rename to aya/src/maps/hash_map/hash_map.rs
index efce299e..824653cb 100644
--- a/aya/src/maps/hash_map.rs
+++ b/aya/src/maps/hash_map/hash_map.rs
@@ -2,15 +2,14 @@
 use std::{
     convert::TryFrom,
     marker::PhantomData,
-    mem,
     ops::{Deref, DerefMut},
     os::unix::io::RawFd,
 };
 
 use crate::{
     generated::bpf_map_type::{BPF_MAP_TYPE_HASH, BPF_MAP_TYPE_LRU_HASH},
-    maps::{IterableMap, Map, MapError, MapIter, MapKeys, MapRef, MapRefMut},
-    sys::{bpf_map_delete_elem, bpf_map_lookup_elem, bpf_map_update_elem},
+    maps::{hash_map, IterableMap, Map, MapError, MapIter, MapKeys, MapRef, MapRefMut},
+    sys::bpf_map_lookup_elem,
     Pod,
 };
 
@@ -49,7 +48,7 @@ impl<T: Deref<Target = Map>, K: Pod, V: Pod> HashMap<T, K, V> {
                 map_type: map_type as u32,
             })?;
         }
-        check_kv_size::<K, V>(&map)?;
+        hash_map::check_kv_size::<K, V>(&map)?;
         let _ = map.fd_or_err()?;
 
         Ok(HashMap {
@@ -85,12 +84,12 @@ impl<T: Deref<Target = Map>, K: Pod, V: Pod> HashMap<T, K, V> {
 impl<T: DerefMut<Target = Map>, K: Pod, V: Pod> HashMap<T, K, V> {
     /// Inserts a key-value pair into the map.
     pub fn insert(&mut self, key: K, value: V, flags: u64) -> Result<(), MapError> {
-        insert(&mut self.inner, key, value, flags)
+        hash_map::insert(&mut self.inner, key, value, flags)
     }
 
     /// Removes a key from the map.
     pub fn remove(&mut self, key: &K) -> Result<(), MapError> {
-        remove(&mut self.inner, key)
+        hash_map::remove(&mut self.inner, key)
     }
 }
 
@@ -136,43 +135,6 @@ impl<'a, K: Pod, V: Pod> TryFrom<&'a mut Map> for HashMap<&'a mut Map, K, V> {
     }
 }
 
-fn check_kv_size<K, V>(map: &Map) -> Result<(), MapError> {
-    let size = mem::size_of::<K>();
-    let expected = map.obj.def.key_size as usize;
-    if size != expected {
-        return Err(MapError::InvalidKeySize { size, expected });
-    }
-    let size = mem::size_of::<V>();
-    let expected = map.obj.def.value_size as usize;
-    Ok(if size != expected {
-        return Err(MapError::InvalidValueSize { size, expected });
-    })
-}
-
-fn insert<K, V>(map: &mut Map, key: K, value: V, flags: u64) -> Result<(), MapError> {
-    let fd = map.fd_or_err()?;
-    bpf_map_update_elem(fd, &key, &value, flags).map_err(|(code, io_error)| {
-        MapError::SyscallError {
-            call: "bpf_map_update_elem".to_owned(),
-            code,
-            io_error,
-        }
-    })?;
-
-    Ok(())
-}
-
-fn remove<K>(map: &mut Map, key: &K) -> Result<(), MapError> {
-    let fd = map.fd_or_err()?;
-    bpf_map_delete_elem(fd, key)
-        .map(|_| ())
-        .map_err(|(code, io_error)| MapError::SyscallError {
-            call: "bpf_map_delete_elem".to_owned(),
-            code,
-            io_error,
-        })
-}
-
 #[cfg(test)]
 mod tests {
     use std::io;
diff --git a/aya/src/maps/hash_map/mod.rs b/aya/src/maps/hash_map/mod.rs
new file mode 100644
index 00000000..31c4ae23
--- /dev/null
+++ b/aya/src/maps/hash_map/mod.rs
@@ -0,0 +1,46 @@
+use std::mem;
+
+use crate::{
+    maps::{Map, MapError},
+    sys::{bpf_map_delete_elem, bpf_map_update_elem},
+};
+
+mod hash_map;
+pub use hash_map::*;
+
+pub(crate) fn check_kv_size<K, V>(map: &Map) -> Result<(), MapError> {
+    let size = mem::size_of::<K>();
+    let expected = map.obj.def.key_size as usize;
+    if size != expected {
+        return Err(MapError::InvalidKeySize { size, expected });
+    }
+    let size = mem::size_of::<V>();
+    let expected = map.obj.def.value_size as usize;
+    Ok(if size != expected {
+        return Err(MapError::InvalidValueSize { size, expected });
+    })
+}
+
+pub(crate) fn insert<K, V>(map: &mut Map, key: K, value: V, flags: u64) -> Result<(), MapError> {
+    let fd = map.fd_or_err()?;
+    bpf_map_update_elem(fd, &key, &value, flags).map_err(|(code, io_error)| {
+        MapError::SyscallError {
+            call: "bpf_map_update_elem".to_owned(),
+            code,
+            io_error,
+        }
+    })?;
+
+    Ok(())
+}
+
+pub(crate) fn remove<K>(map: &mut Map, key: &K) -> Result<(), MapError> {
+    let fd = map.fd_or_err()?;
+    bpf_map_delete_elem(fd, key)
+        .map(|_| ())
+        .map_err(|(code, io_error)| MapError::SyscallError {
+            call: "bpf_map_delete_elem".to_owned(),
+            code,
+            io_error,
+        })
+}