Also make sure MSG_clean is called only once (by maestro).
XBT_PUBLIC(void *) MSG_process_get_data(m_process_t process);
XBT_PUBLIC(MSG_error_t) MSG_process_set_data(m_process_t process,
void *data);
+XBT_PUBLIC(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup);
XBT_PUBLIC(m_host_t) MSG_process_get_host(m_process_t process);
XBT_PUBLIC(m_process_t) MSG_process_from_PID(int PID);
XBT_PUBLIC(int) MSG_process_get_PID(m_process_t process);
*/
static int simgrid_gc(lua_State * L)
{
- MSG_clean();
+ if (sglua_is_maestro(L)) {
+ MSG_clean();
+ }
return 0;
}
/* Initialize the MSG core */
MSG_global_init(&argc, argv);
+ MSG_process_set_data_cleanup((void_f_pvoid_t) lua_close);
XBT_DEBUG("Still %d arguments on command line", argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
}
msg_global->PID = 1;
msg_global->sent_msg = 0;
msg_global->task_copy_callback = NULL;
+ msg_global->process_data_cleanup = NULL;
/* initialization of the action module */
_MSG_action_init();
int session;
unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
void (*task_copy_callback) (m_task_t task, m_process_t src, m_process_t dst);
+ void_f_pvoid_t process_data_cleanup;
} s_MSG_Global_t, *MSG_Global_t;
/*extern MSG_Global_t msg_global;*/
{
simdata_process_t msg_proc;
+ // get the MSG process from the SIMIX process
if (smx_proc == SIMIX_process_self()) {
/* avoid a SIMIX request if this function is called by the process itself */
msg_proc = SIMIX_process_self_get_data(smx_proc);
TRACE_msg_process_end(smx_proc);
#endif
+ // free the data if a function was provided
+ if (msg_proc->data && msg_global->process_data_cleanup) {
+ msg_global->process_data_cleanup(msg_proc->data);
+ }
+
+ // free the MSG process
xbt_free(msg_proc);
}
return MSG_OK;
}
+/** \ingroup m_process_management
+ * \brief Sets a cleanup function to be called to free the userdata of a
+ * process when a process is destroyed.
+ * \param data_cleanup a cleanup function for the userdata of a process,
+ * or NULL to call no function
+ */
+XBT_PUBLIC(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup) {
+
+ msg_global->process_data_cleanup = data_cleanup;
+}
+
/** \ingroup m_process_management
* \brief Return the location on which an agent is running.
* \param process a process (NULL means the current one)