fix test

tikv · Jul 31, 2023 · 9611a81 · 9611a81
1 parent abc23a6
commit 9611a81
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 22 deletions.
diff --git a/ci/run.sh b/ci/run.sh
@@ -26,7 +26,7 @@ fi
 
 cargo build --target "${TARGET}"
 cargo test --target "${TARGET}"
-cargo test --target "${TARGET}" --features profiling
+_RJEM_MALLOC_CONF="prof:true" cargo test --target "${TARGET}" --features profiling
 cargo test --target "${TARGET}" --features debug
 cargo test --target "${TARGET}" --features stats
 cargo test --target "${TARGET}" --features 'debug profiling'

diff --git a/jemalloc-ctl/src/macros.rs b/jemalloc-ctl/src/macros.rs
@@ -43,7 +43,7 @@ macro_rules! types {
 
 /// Read
 macro_rules! r {
-    ($id:ident => $ret_ty:ty) => {
+    ($id:ident[ str: $byte_string:expr ] => $ret_ty:ty) => {
         paste::paste! {
             impl $id {
                 /// Reads value using string API.
@@ -72,6 +72,12 @@ macro_rules! r {
                     if cfg!(target_os = "macos") => return,
                     _ => (),
                 }
+                match $byte_string.as_slice() {
+                    b"opt.prof\0" |
+                    b"prof.active\0"
+                    if !cfg!(feature = "profiling") => return,
+                    _ => (),
+                }
 
                 let a = $id::read().unwrap();
 
@@ -92,7 +98,7 @@ macro_rules! r {
 
 /// Write
 macro_rules! w {
-    ($id:ident => $ret_ty:ty) => {
+    ($id:ident[ str: $byte_string:expr ] => $ret_ty:ty) => {
         paste::paste! {
             impl $id {
                 /// Writes `value` using string API.
@@ -140,6 +146,13 @@ macro_rules! w {
                         if cfg!(target_os = "macos") => return,
                     _ => (),
                 }
+                match $byte_string.as_slice() {
+                    b"prof.dump\0" |
+                    b"prof.active\0" |
+                    b"prof.prefix\0"
+                    if !cfg!(feature = "profiling") => return,
+                    _ => (),
+                }
 
                 let _ = $id::write(<$ret_ty as WriteTestDefault>::default()).unwrap();
 
@@ -161,7 +174,7 @@ macro_rules! w {
 
 /// Update
 macro_rules! u {
-    ($id:ident  => $ret_ty:ty) => {
+    ($id:ident[ str: $byte_string:expr ] => $ret_ty:ty) => {
         paste::paste! {
             impl $id {
                 /// Updates key to `value` returning its old value using string API.
@@ -190,6 +203,11 @@ macro_rules! u {
                         if cfg!(target_os = "macos") => return,
                     _ => (),
                 }
+                match $byte_string.as_slice() {
+                    b"prof.active\0"
+                        if !cfg!(feature = "profiling") => return,
+                    _ => (),
+                }
 
                 let a = $id::update($ret_ty::default()).unwrap();
 
@@ -223,7 +241,7 @@ macro_rules! option {
             mib_docs: $(#[$doc_mib])*
         }
         $(
-            $ops!($id => $ret_ty);
+            $ops!($id[ str: $byte_string ] => $ret_ty);
         )*
     };
     // Non-string option:

diff --git a/jemalloc-ctl/src/opt.rs b/jemalloc-ctl/src/opt.rs
@@ -229,10 +229,13 @@ option! {
     /// # static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
     /// #
     /// # fn main() {
-    /// use tikv_jemalloc_ctl::opt;
-    /// let prof = opt::prof::read().unwrap();
-    /// println!("Jemalloc profiling enabled: {}", prof);
+    /// #[cfg(feature = "profiling")]
+    /// {
+    ///     use tikv_jemalloc_ctl::opt;
+    ///     let prof = opt::prof::read().unwrap();
+    ///     println!("Jemalloc profiling enabled: {}", prof);
+    /// }
     /// # }
     /// ```
     mib_docs: /// See [`prof`].
-}
+}
diff --git a/jemalloc-ctl/src/prof.rs b/jemalloc-ctl/src/prof.rs
@@ -17,11 +17,14 @@ option! {
     /// # static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
     /// #
     /// # fn main() {
-    /// use tikv_jemalloc_ctl::prof;
-    /// use std::ffi::CStr;
-    /// let dump_file_name = CStr::from_bytes_with_nul(b"dump\0").unwrap();
-    /// let dump = prof::dump::mib().unwrap();
-    /// dump.write(dump_file_name).unwrap();
+    /// #[cfg(feature = "profiling")]
+    /// {
+    ///     use tikv_jemalloc_ctl::prof;
+    ///     use std::ffi::CStr;
+    ///     let dump_file_name = CStr::from_bytes_with_nul(b"dump\0").unwrap();
+    ///     let dump = prof::dump::mib().unwrap();
+    ///     dump.write(dump_file_name).unwrap();
+    /// }
     /// # }
     /// ```
     mib_docs: /// See [`dump`].
@@ -42,11 +45,14 @@ option! {
     /// # static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
     /// #
     /// # fn main() {
-    /// use tikv_jemalloc_ctl::prof;
-    /// use std::ffi::CStr;
-    /// let dump_file_name = CStr::from_bytes_with_nul(b"my_prefix\0").unwrap();
-    /// let prefix = prof::prefix::mib().unwrap();
-    /// prefix.write(dump_file_name).unwrap();
+    /// #[cfg(feature = "profiling")]
+    /// {
+    ///     use tikv_jemalloc_ctl::prof;
+    ///     use std::ffi::CStr;
+    ///     let dump_file_name = CStr::from_bytes_with_nul(b"my_prefix\0").unwrap();
+    ///     let prefix = prof::prefix::mib().unwrap();
+    ///     prefix.write(dump_file_name).unwrap();
+    /// }
     /// # }
     /// ```
     mib_docs: /// See [`prefix`].
@@ -68,9 +74,12 @@ option! {
     /// # static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
     /// #
     /// # fn main() {
-    /// use tikv_jemalloc_ctl::prof;
-    /// let active = prof::active::mib().unwrap();
-    /// active.write(true).unwrap();
+    /// #[cfg(feature = "profiling")]
+    /// {
+    ///     use tikv_jemalloc_ctl::prof;
+    ///     let active = prof::active::mib().unwrap();
+    ///     active.write(true).unwrap();
+    /// }    
     /// # }
     /// ```
     mib_docs: /// See [`active`].