#include "private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
+#include "xbt/dict.h"
+#include "msg/mailbox.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
- "Logging specific to SIMIX (process)");
+ "Logging specific to SIMIX (process)");
/******************************** Process ************************************/
/**
xbt_swag_remove(arg, simix_global->process_list);
xbt_swag_remove(arg, simix_global->process_to_run);
xbt_swag_remove(arg,
- ((smx_process_t) arg)->simdata->smx_host->simdata->
- process_list);
+ ((smx_process_t) arg)->simdata->smx_host->
+ simdata->process_list);
free(((smx_process_t) arg)->name);
((smx_process_t) arg)->name = NULL;
* \return The new corresponding object.
*/
smx_process_t SIMIX_process_create(const char *name,
- xbt_main_func_t code, void *data,
- const char *hostname, int argc,
- char **argv)
+ xbt_main_func_t code, void *data,
+ const char *hostname, int argc,
+ char **argv, xbt_dict_t properties)
{
smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t, 1);
smx_process_t process = xbt_new0(s_smx_process_t, 1);
smx_process_t self = NULL;
smx_host_t host = SIMIX_host_get_by_name(hostname);
+ /*char alias[MAX_ALIAS_NAME + 1] = {0};
+ msg_mailbox_t mailbox; */
xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
/* Simulator Data */
simdata->cond = NULL;
simdata->argc = argc;
simdata->argv = argv;
- simdata->context = xbt_context_new(name,code, NULL, NULL,
- simix_global->
- cleanup_process_function, process,
- simdata->argc, simdata->argv);
+ simdata->context = xbt_context_new(name, code, NULL, NULL,
+ simix_global->cleanup_process_function,
+ process, simdata->argc, simdata->argv);
/* Process structure */
process->name = xbt_strdup(name);
process->simdata = simdata;
process->data = data;
+ /* Add properties */
+ simdata->properties = properties;
+
xbt_swag_insert(process, host->simdata->process_list);
/* fix current_process, about which xbt_context_start mocks around */
DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
xbt_swag_insert(process, simix_global->process_to_run);
+ /*sprintf(alias,"%s:%s",hostname,process->name);
+
+ mailbox = MSG_mailbox_new(alias);
+ MSG_mailbox_set_hostname(mailbox, hostname); */
+
return process;
}
* a context with no code, which leads to segfaults in plain libsimgrid
*/
void SIMIX_jprocess_create(const char *name, smx_host_t host,
- void *data,
- void *jprocess, void *jenv, smx_process_t * res)
+ void *data,
+ void *jprocess, void *jenv, smx_process_t * res)
{
smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t, 1);
smx_process_t process = xbt_new0(s_smx_process_t, 1);
DEBUG5("jprocess_create(name=%s,host=%p,data=%p,jproc=%p,jenv=%p)",
- name, host, data, jprocess, jenv);
+ name, host, data, jprocess, jenv);
xbt_assert0(host, "Invalid parameters");
/* Simulator Data */
simdata->smx_host = host;
simdata->argc = 0;
simdata->argv = NULL;
- simdata->context = xbt_context_new(name,NULL, NULL, NULL,
- simix_global->
- cleanup_process_function, process,
- /* argc/argv */ 0, NULL);
+
+ simdata->context = xbt_context_new(name, NULL, NULL, jprocess,
+ simix_global->cleanup_process_function,
+ process,
+ /* argc/argv */ 0, NULL);
/* Process structure */
process->name = xbt_strdup(name);
process->simdata = simdata;
process->data = data;
- SIMIX_process_set_jprocess(process, jprocess);
- SIMIX_process_set_jenv(process, jenv);
xbt_swag_insert(process, host->simdata->process_list);
/* fix current_process, about which xbt_context_start mocks around */
self = simix_global->current_process;
+
xbt_context_start(process->simdata->context);
+
simix_global->current_process = self;
xbt_swag_insert(process, simix_global->process_list);
smx_simdata_process_t p_simdata = process->simdata;
DEBUG2("Killing process %s on %s", process->name,
- p_simdata->smx_host->name);
+ p_simdata->smx_host->name);
/* Cleanup if we were waiting for something */
if (p_simdata->mutex)
smx_host_t SIMIX_process_get_host(smx_process_t process)
{
xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
+ && (process->simdata)), "Invalid parameters");
return (process->simdata->smx_host);
}
const char *SIMIX_process_get_name(smx_process_t process)
{
xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
+ && (process->simdata)), "Invalid parameters");
return (process->name);
}
+/**
+ * \brief Changes the name of an agent.
+ *
+ * This functions checks whether \a process is a valid pointer or not and return its name.
+ * \param process SIMIX process
+ * \param name The new process name
+ */
+void SIMIX_process_set_name(smx_process_t process, char *name)
+{
+ xbt_assert0(((process != NULL)
+ && (process->simdata)), "Invalid parameters");
+
+ process->name = name;
+}
+
+/** \ingroup m_process_management
+ * \brief Return the properties
+ *
+ * This functions returns the properties associated with this process
+ */
+xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
+{
+ return process->simdata->properties;
+}
+
/**
* \brief Return the current agent.
*
simdata->suspended = 1;
c = simdata->cond;
xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
- surf_workstation_model->common_public->suspend(act->simdata->
- surf_action);
+ surf_workstation_model->common_public->suspend(act->
+ simdata->surf_action);
}
} else {
simdata->suspended = 1;
cond = SIMIX_cond_init();
dummy = SIMIX_action_execute(SIMIX_process_get_host(process), name, 0);
- surf_workstation_model->common_public->suspend(dummy->simdata->surf_action);
+ surf_workstation_model->common_public->suspend(dummy->simdata->
+ surf_action);
SIMIX_register_action_to_condition(dummy, cond);
__SIMIX_cond_wait(cond);
- //SIMIX_action_destroy(dummy);
- //SIMIX_cond_destroy(cond);
+ SIMIX_unregister_action_to_condition(dummy, cond);
+ SIMIX_action_destroy(dummy);
+ SIMIX_cond_destroy(cond);
}
return;
}
smx_simdata_process_t simdata = NULL;
xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
+ && (process->simdata)), "Invalid parameters");
SIMIX_CHECK_HOST();
if (process == SIMIX_process_self()) {
simdata = process->simdata;
if (simdata->mutex) {
DEBUG0("Resume process blocked on a mutex");
- simdata->suspended = 0; /* He'll wake up by itself */
+ simdata->suspended = 0; /* He'll wake up by itself */
return;
} else if (simdata->cond) {
/* temporaries variables */
smx_cond_t c;
xbt_fifo_item_t i;
smx_action_t act;
- DEBUG0("Resume process blocked on a conditional");
+ DEBUG0("Resume process blocked on a conditional");
simdata->suspended = 0;
c = simdata->cond;
xbt_fifo_foreach(c->actions, i, act, smx_action_t) {
- surf_workstation_model->common_public->resume(act->simdata->surf_action);
+ surf_workstation_model->common_public->resume(act->simdata->
+ surf_action);
}
SIMIX_cond_signal(c);
return;
}
+/**
+ * \brief Migrates an agent to another location.
+ *
+ * This function changes the value of the host on which \a process is running.
+ */
+void SIMIX_process_change_host(smx_process_t process, char *source,
+ char *dest)
+{
+ smx_simdata_process_t p_simdata = process->simdata;
+ smx_host_t h1 = SIMIX_host_get_by_name(source);
+ smx_host_t h2 = SIMIX_host_get_by_name(dest);
+ p_simdata->smx_host = h2;
+ xbt_swag_remove(process, h1->simdata->process_list);
+ xbt_swag_insert(process, h2->simdata->process_list);
+}
+
/**
* \brief Returns true if the process is suspended .
*
int SIMIX_process_is_suspended(smx_process_t process)
{
xbt_assert0(((process != NULL)
- && (process->simdata)), "Invalid parameters");
+ && (process->simdata)), "Invalid parameters");
return (process->simdata->suspended);
}
-
-
-/* Helper functions for jMSG: manipulate the context data without breaking the module separation */
-#include "xbt/context.h" /* to pass java objects from MSG to the context */
-
-void SIMIX_process_set_jprocess(smx_process_t process, void *jp)
-{
- xbt_context_set_jprocess(process->simdata->context, jp);
-}
-
-void *SIMIX_process_get_jprocess(smx_process_t process)
-{
- return xbt_context_get_jprocess(process->simdata->context);
-}
-
-void SIMIX_process_set_jmutex(smx_process_t process, void *jm)
-{
- xbt_context_set_jmutex(process->simdata->context, jm);
-}
-
-void *SIMIX_process_get_jmutex(smx_process_t process)
-{
- return xbt_context_get_jmutex(process->simdata->context);
-}
-
-void SIMIX_process_set_jcond(smx_process_t process, void *jc)
-{
- xbt_context_set_jcond(process->simdata->context, jc);
-}
-
-void *SIMIX_process_get_jcond(smx_process_t process)
-{
- return xbt_context_get_jcond(process->simdata->context);
-}
-
-void SIMIX_process_set_jenv(smx_process_t process, void *je)
-{
- xbt_context_set_jenv(process->simdata->context, je);
-}
-
-void *SIMIX_process_get_jenv(smx_process_t process)
-{
- return xbt_context_get_jenv(process->simdata->context);
-}
