UTEXKER-562: accept closures as handlers in the Context

Cargo.toml

@@ -22,6 +22,7 @@ pretty_env_logger = "0.4"
 galvanic-assert = "0.8"
 chrono = "0.4"
 memoffset = "0.6.4"
+dyn-clone = "1.0.4"
 
 [dev-dependencies]
 tempfile = "3.1"

examples/basic_publisher.rs

@@ -108,8 +108,8 @@ fn main() {
 
     println!("Using CnC file: {}", context.cnc_file_name());
 
-    context.set_new_publication_handler(on_new_publication_handler);
-    context.set_error_handler(error_handler);
+    context.set_new_publication_handler(Box::new(on_new_publication_handler));
+    context.set_error_handler(Box::new(error_handler));
     context.set_pre_touch_mapped_memory(true);
 
     let aeron = Aeron::new(context);

examples/basic_subscriber.rs

@@ -65,10 +65,6 @@ fn parse_cmd_line() -> Settings {
     Settings::new()
 }
 
-fn on_new_subscription_handler(channel: CString, stream_id: i32, correlation_id: i64) {
-    println!("Subscription: {} {} {}", channel.to_str().unwrap(), stream_id, correlation_id);
-}
-
 fn available_image_handler(image: &Image) {
     println!(
         "Available image correlation_id={} session_id={} at position={} from {}",
@@ -132,10 +128,12 @@ fn main() {
 
     println!("Using CnC file: {}", context.cnc_file_name());
 
-    context.set_new_subscription_handler(on_new_subscription_handler);
-    context.set_available_image_handler(available_image_handler);
-    context.set_unavailable_image_handler(unavailable_image_handler);
-    context.set_error_handler(error_handler);
+    context.set_new_subscription_handler(Box::new(|channel: CString, stream_id: i32, correlation_id: i64| {
+        println!("Subscription: {} {} {}", channel.to_str().unwrap(), stream_id, correlation_id)
+    }));
+    context.set_available_image_handler(Box::new(available_image_handler));
+    context.set_unavailable_image_handler(Box::new(unavailable_image_handler));
+    context.set_error_handler(Box::new(error_handler));
     context.set_pre_touch_mapped_memory(true);
 
     let aeron = Aeron::new(context);

examples/ping.rs

@@ -209,11 +209,11 @@ fn main() {
 
     println!("Using CnC file: {}", context.cnc_file_name());
 
-    context.set_new_subscription_handler(on_new_subscription_handler);
-    context.set_new_publication_handler(on_new_publication_handler);
-    context.set_available_image_handler(available_image_handler);
-    context.set_unavailable_image_handler(unavailable_image_handler);
-    context.set_error_handler(error_handler);
+    context.set_new_subscription_handler(Box::new(on_new_subscription_handler));
+    context.set_new_publication_handler(Box::new(on_new_publication_handler));
+    context.set_available_image_handler(Box::new(available_image_handler));
+    context.set_unavailable_image_handler(Box::new(unavailable_image_handler));
+    context.set_error_handler(Box::new(error_handler));
     context.set_pre_touch_mapped_memory(true);
     //context.set_use_conductor_agent_invoker(true); // start it in one thread for debugging
 

examples/throughput.rs

@@ -161,11 +161,11 @@ fn main() {
 
     println!("Using CnC file: {}", context.cnc_file_name());
 
-    context.set_new_subscription_handler(on_new_subscription_handler);
-    context.set_new_publication_handler(on_new_publication_handler);
-    context.set_available_image_handler(available_image_handler);
-    context.set_unavailable_image_handler(unavailable_image_handler);
-    context.set_error_handler(error_handler);
+    context.set_new_subscription_handler(Box::new(on_new_subscription_handler));
+    context.set_new_publication_handler(Box::new(on_new_publication_handler));
+    context.set_available_image_handler(Box::new(available_image_handler));
+    context.set_unavailable_image_handler(Box::new(unavailable_image_handler));
+    context.set_error_handler(Box::new(error_handler));
     context.set_pre_touch_mapped_memory(true);
     //context.set_use_conductor_agent_invoker(true); // start it in one thread for debugging
 

src/aeron.rs

@@ -309,8 +309,8 @@ impl Aeron {
         &mut self,
         channel: CString,
         stream_id: i32,
-        on_available_image_handler: OnAvailableImage,
-        on_unavailable_image_handler: OnUnavailableImage,
+        on_available_image_handler: Box<dyn OnAvailableImage>,
+        on_unavailable_image_handler: Box<dyn OnUnavailableImage>,
     ) -> Result<i64, AeronError> {
         self.conductor.lock().expect("Mutex poisoned").add_subscription(
             channel,
@@ -401,7 +401,7 @@ impl Aeron {
      *
      * @param handler to be added to the available counters list.
      */
-    pub fn add_available_counter_handler(&mut self, handler: OnAvailableCounter) {
+    pub fn add_available_counter_handler(&mut self, handler: Box<dyn OnAvailableCounter>) {
         let _ignored = self
             .conductor
             .lock()
@@ -414,7 +414,7 @@ impl Aeron {
      *
      * @param handler to be removed from the available counters list.
      */
-    pub fn remove_available_counter_handler(&mut self, handler: OnAvailableCounter) {
+    pub fn remove_available_counter_handler(&mut self, handler: Box<dyn OnAvailableCounter>) {
         let _ignored = self
             .conductor
             .lock()
@@ -427,7 +427,7 @@ impl Aeron {
      *
      * @param handler to be added to the unavailable counters list.
      */
-    pub fn add_unavailable_counter_handler(&mut self, handler: OnUnavailableCounter) {
+    pub fn add_unavailable_counter_handler(&mut self, handler: Box<dyn OnUnavailableCounter>) {
         let _ignored = self
             .conductor
             .lock()
@@ -440,7 +440,7 @@ impl Aeron {
      *
      * @param handler to be removed from the unavailable counters list.
      */
-    pub fn remove_unavailable_counter_handler(&mut self, handler: OnUnavailableCounter) {
+    pub fn remove_unavailable_counter_handler(&mut self, handler: Box<dyn OnUnavailableCounter>) {
         let _ignored = self
             .conductor
             .lock()
@@ -453,7 +453,7 @@ impl Aeron {
      *
      * @param handler to be added to the close client handlers list.
      */
-    pub fn add_close_client_handler(&mut self, handler: OnCloseClient) {
+    pub fn add_close_client_handler(&mut self, handler: Box<dyn OnCloseClient>) {
         let _ignored = self
             .conductor
             .lock()
@@ -466,7 +466,7 @@ impl Aeron {
      *
      * @param handler to be removed from the close client handlers list.
      */
-    pub fn remove_close_client_handler(&mut self, handler: OnCloseClient) {
+    pub fn remove_close_client_handler(&mut self, handler: Box<dyn OnCloseClient>) {
         let _ignored = self
             .conductor
             .lock()