"Logging specific to MSG (process)");
/******************************** Process ************************************/
+/** \ingroup m_process_management
+ * \brief Creates and runs a new #m_process_t.
+ *
+ * Does exactly the same as #MSG_process_create_with_arguments but without
+ providing standard arguments (\a argc, \a argv).
+ * \sa MSG_process_create_with_arguments
+ */
+m_process_t MSG_process_create(const char *name,
+ m_process_code_t code, void *data,
+ m_host_t host)
+{
+ return MSG_process_create_with_arguments(name, code, data, host, -1, NULL);
+}
+
+static void MSG_process_cleanup(void *arg)
+{
+ xbt_fifo_remove(msg_global->process_list, arg);
+ xbt_fifo_remove(msg_global->process_to_run, arg);
+ xbt_fifo_remove(((m_process_t) arg)->simdata->host->simdata->process_list, arg);
+ xbt_free(((m_process_t) arg)->name);
+ xbt_free(((m_process_t) arg)->simdata);
+ xbt_free(arg);
+}
+
/** \ingroup m_process_management
* \brief Creates and runs a new #m_process_t.
object. It is for user-level information and can be NULL. It can
be retrieved with the function \ref MSG_process_get_data.
* \param host the location where the new agent is executed.
+ * \param argc first argument passed to \a code
+ * \param argv second argument passed to \a code
* \see m_process_t
* \return The new corresponding object.
*/
-m_process_t MSG_process_create(const char *name,
- m_process_code_t code, void *data,
- m_host_t host)
+m_process_t MSG_process_create_with_arguments(const char *name,
+ m_process_code_t code, void *data,
+ m_host_t host, int argc, char **argv)
{
simdata_process_t simdata = xbt_new0(s_simdata_process_t,1);
m_process_t process = xbt_new0(s_m_process_t,1);
simdata->PID = PID++;
simdata->host = host;
simdata->waiting_task = NULL;
- simdata->put_host = NULL;
- simdata->put_channel = -1;
- simdata->argc = -1;
- simdata->argv = NULL;
- simdata->context = xbt_context_new(code, simdata->argc, simdata->argv);
+ simdata->argc = argc;
+ simdata->argv = argv;
+ simdata->context = xbt_context_new(code, NULL, NULL,
+ MSG_process_cleanup, process,
+ simdata->argc, simdata->argv);
if((self=msg_global->current_process)) {
simdata->PPID = MSG_process_get_PID(self);
self = msg_global->current_process;
xbt_context_start(process->simdata->context);
msg_global->current_process = self;
+
+ xbt_fifo_push(msg_global->process_list, process);
+ xbt_fifo_push(msg_global->process_to_run, process);
+
return process;
}
+/** \ingroup m_process_management
+ * \param process poor victim
+ *
+ * This function simply kills a \a process... scarry isn't it ? :)
+ */
+void MSG_process_kill(m_process_t process)
+{
+ xbt_fifo_remove(msg_global->process_list,process);
+ xbt_context_free(process->simdata->context);
+ MSG_process_cleanup(process);
+}
+
/** \ingroup m_process_management
* \brief Migrates an agent to another location.
*
return (((simdata_process_t) process->simdata)->PID);
}
-
/** \ingroup m_process_management
* \brief Returns the process ID of the parent of \a process.
*
simdata_task = simdata->waiting_task->simdata;
+ simdata->suspended = 1;
+ if(simdata->blocked) return MSG_OK;
+
xbt_assert0(((simdata_task->compute)||(simdata_task->comm))&&
- !((simdata_task->comm)&&(simdata_task->comm)),
+ !((simdata_task->compute)&&(simdata_task->comm)),
"Got a problem in deciding which action to choose !");
+ simdata->suspended = 1;
if(simdata_task->compute)
- surf_workstation_resource->extension_public->suspend(simdata_task->compute);
- else
- surf_workstation_resource->extension_public->suspend(simdata_task->comm);
-
+ surf_workstation_resource->common_public->suspend(simdata_task->compute);
+ else
+ surf_workstation_resource->common_public->suspend(simdata_task->comm);
} else {
m_task_t dummy = MSG_TASK_UNINITIALIZED;
- dummy = MSG_task_create("suspended", 0.01, 0, NULL);
+ dummy = MSG_task_create("suspended", 0.0, 0, NULL);
+ simdata = process->simdata;
+ simdata->suspended = 1;
__MSG_task_execute(process,dummy);
- surf_workstation_resource->extension_public->suspend(dummy->simdata->compute);
+ surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
__MSG_wait_for_computation(process,dummy);
+ simdata->suspended = 0;
MSG_task_destroy(dummy);
}
CHECK_HOST();
simdata = process->simdata;
+
+ if(simdata->blocked) {
+ simdata->suspended = 0; /* He'll wake up by itself */
+ MSG_RETURN(MSG_OK);
+ }
+
if(!(simdata->waiting_task)) {
xbt_assert0(0,"Process not waiting for anything else. Weird !");
return MSG_WARNING;
}
simdata_task = simdata->waiting_task->simdata;
+
if(simdata_task->compute)
- surf_workstation_resource->extension_public->resume(simdata_task->compute);
+ surf_workstation_resource->common_public->resume(simdata_task->compute);
else
- surf_workstation_resource->extension_public->resume(simdata_task->comm);
+ surf_workstation_resource->common_public->resume(simdata_task->comm);
MSG_RETURN(MSG_OK);
}
* task on which it was waiting for the completion.
*/
int MSG_process_isSuspended(m_process_t process)
+{
+ xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+
+ return (process->simdata->suspended);
+}
+
+MSG_error_t __MSG_process_block(void)
+{
+ m_process_t process = MSG_process_self();
+
+ m_task_t dummy = MSG_TASK_UNINITIALIZED;
+ dummy = MSG_task_create("blocked", 0.0, 0, NULL);
+
+ process->simdata->blocked=1;
+ __MSG_task_execute(process,dummy);
+ surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
+ __MSG_wait_for_computation(process,dummy);
+ process->simdata->blocked=0;
+
+ if(process->simdata->suspended)
+ MSG_process_suspend(process);
+
+ MSG_task_destroy(dummy);
+
+ return MSG_OK;
+}
+
+MSG_error_t __MSG_process_unblock(m_process_t process)
{
simdata_process_t simdata = NULL;
simdata_task_t simdata_task = NULL;
int i;
-
+
xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+ CHECK_HOST();
simdata = process->simdata;
if(!(simdata->waiting_task)) {
xbt_assert0(0,"Process not waiting for anything else. Weird !");
- return 0;
+ return MSG_WARNING;
}
-
simdata_task = simdata->waiting_task->simdata;
- if(simdata_task->compute)
- return surf_workstation_resource->extension_public->is_suspended(simdata_task->compute);
- else
- return surf_workstation_resource->extension_public->is_suspended(simdata_task->comm);
+ xbt_assert0(simdata->blocked,"Process not blocked");
+
+ surf_workstation_resource->common_public->resume(simdata_task->compute);
+
+ MSG_RETURN(MSG_OK);
+}
+
+int __MSG_process_isBlocked(m_process_t process)
+{
+ xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
+
+ return (process->simdata->blocked);
}
