#include "popping_bodies.c"
-/**
- * \ingroup simix_host_management
- * \brief Returns a host given its name.
- *
- * \param name The name of the host to get
- * \return The corresponding host
- */
-sg_host_t simcall_host_get_by_name(const char *name)
-{
- return simcall_BODY_host_get_by_name(name);
-}
-
/**
* \ingroup simix_host_management
* \brief Returns the name of a host.
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Creates a synchro that executes some computation of an host.
*
* This function creates a SURF action and allocates the data necessary
* to create the SIMIX synchro. It can raise a host_error exception if the host crashed.
*
* \param name Name of the execution synchro to create
- * \param host SIMIX host where the synchro will be executed
* \param flops_amount amount Computation amount (in flops)
* \param priority computation priority
* \param bound
* \param affinity_mask
* \return A new SIMIX execution synchronization
*/
-smx_synchro_t simcall_host_execute(const char *name, sg_host_t host,
+smx_synchro_t simcall_process_execute(const char *name,
double flops_amount,
double priority, double bound, unsigned long affinity_mask)
{
xbt_assert(isfinite(flops_amount), "flops_amount is not finite!");
xbt_assert(isfinite(priority), "priority is not finite!");
- return simcall_BODY_host_execute(name, host, flops_amount, priority, bound, affinity_mask);
+ return simcall_BODY_process_execute(name, flops_amount, priority, bound, affinity_mask);
}
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Creates a synchro that may involve parallel computation on
* several hosts and communication between them.
*
* \param rate the SURF action rate
* \return A new SIMIX execution synchronization
*/
-smx_synchro_t simcall_host_parallel_execute(const char *name,
+smx_synchro_t simcall_process_parallel_execute(const char *name,
int host_nb,
sg_host_t *host_list,
double *flops_amount,
xbt_assert(isfinite(amount), "amount is not finite!");
xbt_assert(isfinite(rate), "rate is not finite!");
- return simcall_BODY_host_parallel_execute(name, host_nb, host_list,
+ return simcall_BODY_process_parallel_execute(name, host_nb, host_list,
flops_amount,
bytes_amount,
amount, rate);
}
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Destroys an execution synchro.
*
* Destroys a synchro, freeing its memory. This function cannot be called if there are a conditional waiting for it.
* \param execution The execution synchro to destroy
*/
-void simcall_host_execution_destroy(smx_synchro_t execution)
+void simcall_process_execution_destroy(smx_synchro_t execution)
{
- simcall_BODY_host_execution_destroy(execution);
+ simcall_BODY_process_execution_destroy(execution);
}
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Cancels an execution synchro.
*
* This functions stops the execution. It calls a surf function.
* \param execution The execution synchro to cancel
*/
-void simcall_host_execution_cancel(smx_synchro_t execution)
+void simcall_process_execution_cancel(smx_synchro_t execution)
{
- simcall_BODY_host_execution_cancel(execution);
+ simcall_BODY_process_execution_cancel(execution);
}
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Returns how much of an execution synchro remains to be done.
*
* \param execution The execution synchro
* \return The remaining amount
*/
-double simcall_host_execution_get_remains(smx_synchro_t execution)
+double simcall_process_execution_get_remains(smx_synchro_t execution)
{
- return simcall_BODY_host_execution_get_remains(execution);
+ return simcall_BODY_process_execution_get_remains(execution);
}
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Returns the state of an execution synchro.
*
* \param execution The execution synchro
* \return The state
*/
-e_smx_state_t simcall_host_execution_get_state(smx_synchro_t execution)
+e_smx_state_t simcall_process_execution_get_state(smx_synchro_t execution)
{
- return simcall_BODY_host_execution_get_state(execution);
+ return simcall_BODY_process_execution_get_state(execution);
}
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Changes the priority of an execution synchro.
*
* This functions changes the priority only. It calls a surf function.
* \param execution The execution synchro
* \param priority The new priority
*/
-void simcall_host_execution_set_priority(smx_synchro_t execution, double priority)
+void simcall_process_execution_set_priority(smx_synchro_t execution, double priority)
{
/* checking for infinite values */
xbt_assert(isfinite(priority), "priority is not finite!");
- simcall_BODY_host_execution_set_priority(execution, priority);
+ simcall_BODY_process_execution_set_priority(execution, priority);
}
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Changes the capping (the maximum CPU utilization) of an execution synchro.
*
* This functions changes the capping only. It calls a surf function.
* \param execution The execution synchro
* \param bound The new bound
*/
-void simcall_host_execution_set_bound(smx_synchro_t execution, double bound)
+void simcall_process_execution_set_bound(smx_synchro_t execution, double bound)
{
- simcall_BODY_host_execution_set_bound(execution, bound);
+ simcall_BODY_process_execution_set_bound(execution, bound);
}
/**
- * \ingroup simix_host_management
+ * \ingroup simix_process_management
* \brief Changes the CPU affinity of an execution synchro.
*
* This functions changes the CPU affinity of an execution synchro. See taskset(1) on Linux.
* \param host Host
* \param mask Affinity mask
*/
-void simcall_host_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask)
+void simcall_process_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask)
{
- simcall_BODY_host_execution_set_affinity(execution, host, mask);
+ simcall_BODY_process_execution_set_affinity(execution, host, mask);
}
/**
*
* \param execution The execution synchro
*/
-e_smx_state_t simcall_host_execution_wait(smx_synchro_t execution)
+e_smx_state_t simcall_process_execution_wait(smx_synchro_t execution)
{
- return simcall_BODY_host_execution_wait(execution);
+ return simcall_BODY_process_execution_wait(execution);
}
simcall_BODY_vm_set_affinity(vm, pm, mask);
}
-void simcall_host_get_params(sg_host_t vm, ws_params_t params)
+void simcall_host_get_params(sg_host_t vm, vm_params_t params)
{
simcall_BODY_host_get_params(vm, params);
}
-void simcall_host_set_params(sg_host_t vm, ws_params_t params)
+void simcall_host_set_params(sg_host_t vm, vm_params_t params)
{
simcall_BODY_host_set_params(vm, params);
}
*
* The structure and the corresponding thread are created and put in the list of ready processes.
*
- * \param process the process created will be stored in this pointer
* \param name a name for the process. It is for user-level information and can be NULL.
* \param code the main function of the process
* \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can be NULL.
* \param properties the properties of the process
* \param auto_restart either it is autorestarting or not.
*/
-void simcall_process_create(smx_process_t *process, const char *name,
+smx_process_t simcall_process_create(const char *name,
xbt_main_func_t code,
void *data,
const char *hostname,
xbt_dict_t properties,
int auto_restart)
{
- simcall_BODY_process_create(process, name, code, data, hostname,
+ return (smx_process_t) simcall_BODY_process_create(name, code, data, hostname,
kill_time, argc, argv, properties,
auto_restart);
}
/**
* \ingroup simix_process_management
* \brief Set the kill time of a process.
- * \param process a process
- * \param kill_time a double
*/
void simcall_process_set_kill_time(smx_process_t process, double kill_time)
{
}
}
}
+/**
+ * \ingroup simix_process_management
+ * \brief Get the kill time of a process (or 0 if unset).
+ */
+double simcall_process_get_kill_time(smx_process_t process) {
+ return SIMIX_timer_get_date(process->kill_timer);
+}
/**
* \ingroup simix_process_management
