please sonar and simplify simcalls (before killing them)

[simgrid.git] / src / simix / popping_private.h

diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h
index 934565c..c04b0b2 100644 (file)
--- a/src/simix/popping_private.h
+++ b/src/simix/popping_private.h
@@ -121,9 +121,11 @@ SIMIX_MARSHAL(FPtr, fp);
 
 inline void unmarshal(type<void>, u_smx_scalar const& simcall)
 {
+  /* Nothing to do for void data */
 }
 inline void unmarshal_raw(type<void>, u_smx_scalar const& simcall)
 {
+  /* Nothing to do for void data */
 }
 
 template<class T> inline
@@ -144,13 +146,17 @@ template <class T> inline T* unmarshal_raw(type<T*>, u_smx_scalar const& simcall
 template <class T>
 inline void marshal(type<boost::intrusive_ptr<T>>, u_smx_scalar& simcall, boost::intrusive_ptr<T> value)
 {
-  intrusive_ptr_add_ref(&*value);
-  simcall.dp = static_cast<void*>(&*value);
+  if (value.get() == nullptr) { // Sometimes we return nullptr in an intrusive_ptr...
+    simcall.dp = nullptr;
+  } else {
+    intrusive_ptr_add_ref(&*value);
+    simcall.dp = static_cast<void*>(&*value);
+  }
 }
 template <class T> inline boost::intrusive_ptr<T> unmarshal(type<boost::intrusive_ptr<T>>, u_smx_scalar const& simcall)
 {
+  // refcount was already increased during the marshaling, thus the "false" as last argument
   boost::intrusive_ptr<T> res = boost::intrusive_ptr<T>(static_cast<T*>(simcall.dp), false);
-  // intrusive_ptr_release(&*res);
   return res;
 }
 template <class T> inline T* unmarshal_raw(type<boost::intrusive_ptr<T>>, u_smx_scalar const& simcall)