From bda90573fadc5afd6af273f9511594272db3134f Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Wed, 2 Feb 2022 16:01:34 +1100
Subject: [PATCH] jemalloc and triomphe

---
 Cargo.lock                          | 42 +++++++++++++++++++++++++++++
 common/malloc_utils/Cargo.toml      |  2 ++
 common/malloc_utils/src/jemalloc.rs |  2 ++
 common/malloc_utils/src/lib.rs      | 15 ++++++++---
 testing/ef_tests/Cargo.toml         |  1 +
 testing/ef_tests/tests/tests.rs     |  2 ++
 6 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 common/malloc_utils/src/jemalloc.rs

diff --git a/Cargo.lock b/Cargo.lock
index b220100832..d405f9776d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1345,6 +1345,7 @@ dependencies = [
  "fork_choice",
  "fs2",
  "hex",
+ "malloc_utils",
  "rayon",
  "serde",
  "serde_derive",
@@ -2042,6 +2043,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
+
 [[package]]
 name = "funty"
 version = "1.1.0"
@@ -2766,6 +2773,27 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
+[[package]]
+name = "jemalloc-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
+dependencies = [
+ "cc",
+ "fs_extra",
+ "libc",
+]
+
+[[package]]
+name = "jemallocator"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
+dependencies = [
+ "jemalloc-sys",
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.55"
@@ -3526,6 +3554,7 @@ dependencies = [
 name = "malloc_utils"
 version = "0.1.0"
 dependencies = [
+ "jemallocator",
  "lazy_static",
  "libc",
  "lighthouse_metrics",
@@ -3617,10 +3646,12 @@ dependencies = [
  "derivative",
  "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth2_ssz",
+ "itertools",
  "parking_lot",
  "serde",
  "smallvec",
  "tree_hash",
+ "triomphe",
  "typenum",
 ]
 
@@ -6373,6 +6404,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "triomphe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c45e322b26410d7260e00f64234810c2f17d7ece356182af4df8f7ff07890f09"
+dependencies = [
+ "memoffset",
+ "serde",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "trust-dns-proto"
 version = "0.20.3"
diff --git a/common/malloc_utils/Cargo.toml b/common/malloc_utils/Cargo.toml
index 813584992e..1c0e0c4946 100644
--- a/common/malloc_utils/Cargo.toml
+++ b/common/malloc_utils/Cargo.toml
@@ -11,6 +11,8 @@ lighthouse_metrics = { path = "../lighthouse_metrics" }
 lazy_static = "1.4.0"
 libc = "0.2.79"
 parking_lot = "0.11.0"
+jemallocator = { version = "0.3.0", optional = true }
 
 [features]
 mallinfo2 = []
+jemalloc = ["jemallocator"]
diff --git a/common/malloc_utils/src/jemalloc.rs b/common/malloc_utils/src/jemalloc.rs
new file mode 100644
index 0000000000..d088253dcd
--- /dev/null
+++ b/common/malloc_utils/src/jemalloc.rs
@@ -0,0 +1,2 @@
+#[global_allocator]
+static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
diff --git a/common/malloc_utils/src/lib.rs b/common/malloc_utils/src/lib.rs
index b8aed948f8..c79accddd8 100644
--- a/common/malloc_utils/src/lib.rs
+++ b/common/malloc_utils/src/lib.rs
@@ -24,18 +24,27 @@
 //! detecting `glibc` are best-effort. If this crate throws errors about undefined external
 //! functions, then try to compile with the `not_glibc_interface` module.
 
-#[cfg(all(target_os = "linux", not(target_env = "musl")))]
+#[cfg(all(
+    target_os = "linux",
+    not(any(target_env = "musl", feature = "jemalloc"))
+))]
 mod glibc;
 
+#[cfg(feature = "jemalloc")]
+mod jemalloc;
+
 pub use interface::*;
 
-#[cfg(all(target_os = "linux", not(target_env = "musl")))]
+#[cfg(all(
+    target_os = "linux",
+    not(any(target_env = "musl", feature = "jemalloc"))
+))]
 mod interface {
     pub use crate::glibc::configure_glibc_malloc as configure_memory_allocator;
     pub use crate::glibc::scrape_mallinfo_metrics as scrape_allocator_metrics;
 }
 
-#[cfg(any(not(target_os = "linux"), target_env = "musl"))]
+#[cfg(any(not(target_os = "linux"), target_env = "musl", feature = "jemalloc"))]
 mod interface {
     #[allow(dead_code, clippy::unnecessary_wraps)]
     pub fn configure_memory_allocator() -> Result<(), String> {
diff --git a/testing/ef_tests/Cargo.toml b/testing/ef_tests/Cargo.toml
index 6819674664..6407b8b54f 100644
--- a/testing/ef_tests/Cargo.toml
+++ b/testing/ef_tests/Cargo.toml
@@ -35,3 +35,4 @@ fs2 = "0.4.3"
 beacon_chain = { path = "../../beacon_node/beacon_chain" }
 store = { path = "../../beacon_node/store" }
 fork_choice = { path = "../../consensus/fork_choice" }
+malloc_utils = { path = "../../common/malloc_utils" }
diff --git a/testing/ef_tests/tests/tests.rs b/testing/ef_tests/tests/tests.rs
index bdefec0014..e07e099b8f 100644
--- a/testing/ef_tests/tests/tests.rs
+++ b/testing/ef_tests/tests/tests.rs
@@ -305,6 +305,7 @@ mod ssz_static {
     }
 }
 
+/*
 #[test]
 fn ssz_generic() {
     SszGenericHandler::<BasicVector>::default().run();
@@ -314,6 +315,7 @@ fn ssz_generic() {
     SszGenericHandler::<Uints>::default().run();
     SszGenericHandler::<Containers>::default().run();
 }
+*/
 
 #[test]
 fn epoch_processing_justification_and_finalization() {