complete migration to better redis allocator

Author: siscia

src/alloc.rs

@@ -1,13 +1,10 @@
 use std::alloc::{GlobalAlloc, Layout};
 use std::os::raw::c_void;
-use std::sync::atomic::{AtomicBool, Ordering::SeqCst};
 
 use crate::raw;
 
 pub struct RedisAlloc;
 
-static USE_REDIS_ALLOC: AtomicBool = AtomicBool::new(false);
-
 unsafe impl GlobalAlloc for RedisAlloc {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
         let size = (layout.size() + layout.align() - 1) & (!(layout.align() - 1));
@@ -18,8 +15,3 @@ unsafe impl GlobalAlloc for RedisAlloc {
         return raw::RedisModule_Free.unwrap()(ptr as *mut c_void);
     }
 }
-
-pub fn use_redis_alloc() {
-    USE_REDIS_ALLOC.store(true, SeqCst);
-    eprintln!("Now using Redis allocator");
-}

src/lib.rs

@@ -28,6 +28,7 @@ mod key;
 pub use crate::context::Context;
 pub use crate::redismodule::*;
 
+#[cfg(not(test))]
 #[global_allocator]
 static ALLOC: crate::alloc::RedisAlloc = crate::alloc::RedisAlloc;
 

src/macros.rs

@@ -95,22 +95,16 @@ macro_rules! redis_module {
                     dest = dest.add(1);
                 }
             }
-                // We use an explicit block here to make sure all memory allocated before we
-                // switch to the Redis allocator will be out of scope and thus deallocated.
-                let module_version = $module_version as c_int;
+            // We use an explicit block here to make sure all memory allocated before we
+            // switch to the Redis allocator will be out of scope and thus deallocated.
+            let module_version = $module_version as c_int;
 
-                if unsafe { raw::Export_RedisModule_Init(
-                    ctx,
-                    name_buffer.as_ptr() as *const std::os::raw::c_char,
-                    module_version,
-                    raw::REDISMODULE_APIVER_1 as c_int,
-                ) } == raw::Status::Err as c_int { return raw::Status::Err as c_int; }
-
-            if true {
-                redis_module::alloc::use_redis_alloc();
-            } else {
-                eprintln!("*** NOT USING Redis allocator ***");
-            }
+            if unsafe { raw::Export_RedisModule_Init(
+                ctx,
+                name_buffer.as_ptr() as *const std::os::raw::c_char,
+                module_version,
+                raw::REDISMODULE_APIVER_1 as c_int,
+            ) } == raw::Status::Err as c_int { return raw::Status::Err as c_int; }
 
             $(
                 if $init_func(ctx) == raw::Status::Err as c_int {