Merge pull request #275 from MiguelCompany/atexit_injection

igaztanaga · web-flow · commit 3ca315bc2750 · 2025-11-11T23:17:36.000+01:00
Allow injection of custom atexit procedure
diff --git a/include/boost/interprocess/detail/intermodule_singleton_common.hpp b/include/boost/interprocess/detail/intermodule_singleton_common.hpp
@@ -421,7 +421,7 @@ class intermodule_singleton_impl
             } BOOST_INTERPROCESS_CATCH_END
          }
          //if(Phoenix){
-            std::atexit(&atexit_work);
+            BOOST_INTERPROCESS_ATEXIT(&atexit_work);
          //}
          atomic_inc32(&rcount->singleton_ref_count);
          ret_ptr = rcount->ptr;
diff --git a/include/boost/interprocess/detail/workaround.hpp b/include/boost/interprocess/detail/workaround.hpp
@@ -375,4 +375,8 @@ namespace boost {
 
 #endif   //!defined(DISABLE_BOOST_INTERPROCESS_EINTR_RETRY) && defined(__GNUC__)
 
+#if !defined(BOOST_INTERPROCESS_ATEXIT)
+   #define BOOST_INTERPROCESS_ATEXIT(f) std::atexit((f))
+#endif   //!defined(BOOST_INTERPROCESS_ATEXIT)
+
 #endif   //#ifndef BOOST_INTERPROCESS_DETAIL_WORKAROUND_HPP

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ class intermodule_singleton_impl`
`421`	`421`	`} BOOST_INTERPROCESS_CATCH_END`
`422`	`422`	`}`
`423`	`423`	`//if(Phoenix){`
`424`		`- std::atexit(&atexit_work);`
	`424`	`+ BOOST_INTERPROCESS_ATEXIT(&atexit_work);`
`425`	`425`	`//}`
`426`	`426`	`atomic_inc32(&rcount->singleton_ref_count);`
`427`	`427`	`ret_ptr = rcount->ptr;`