Haplotype should be thread-safe again

Author: sirno

CHANGELOG.md

@@ -8,6 +8,8 @@
 - Added epistatic interactions
 - Added preliminary cached fitness evaluation for recombinants
 - Huge performance improvements when collecting all mutations
+- Tree will now merge internal nodes when possible
+- Methods that access data have to be annotated with `#[require_deferred_drop]`
 
 ## 0.3.0 --- Mixed Performance (May 06, 2024)
 

Cargo.lock

@@ -21,6 +21,7 @@ opt-level = 3
 codegen-units = 1
 
 [workspace]
+members = ["macros"]
 
 [dependencies]
 block-id = "0.1.2"
@@ -44,6 +45,7 @@ seq_io = "0.3.1"
 simple-logging = "2.0.2"
 anyhow = "1.0"
 rayon = { version = "1.7.0", optional = true }
+macros = { path = "macros" }
 
 [build-dependencies]
 clap = { version = "4.3.11", features = ["derive"] }

Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "macros"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "1.0", features = ["full"] }

macros/Cargo.toml

@@ -0,0 +1,48 @@
+//! # require_deferred_drop
+//!
+//! This crate provides a procedural macro to require deferred drop for a type that implements
+//! `DeferredDrop`.
+
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{parse_macro_input, ItemFn};
+
+#[proc_macro_attribute]
+pub fn require_deferred_drop(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    // Parse the input tokens into a syntax tree
+    let input_fn = parse_macro_input!(item as ItemFn);
+
+    // Extract parts of the function
+    let attrs = input_fn.attrs;
+    let vis = input_fn.vis;
+    let sig = input_fn.sig;
+    let block = input_fn.block;
+
+    // Generate the new function body
+    let expanded = quote! {
+        #(#attrs)*
+        #vis #sig {
+            self.require_deferred_drop();
+
+            let __require_deferred_drop_result = (|| #block )();
+
+            match self.inquire_deferred_drop() {
+                Ok(Some(haplotype_ref)) => {
+                    drop(haplotype_ref);
+                },
+                Ok(None) => {},
+                Err(e) => {
+                    // Handle or propagate the error as needed
+                    // For example, you can return Err(e);
+                },
+            }
+
+            __require_deferred_drop_result
+        }
+    };
+
+    // Return the generated code as a TokenStream
+    TokenStream::from(expanded)
+}