A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SGpp] make SURF_CPU_LEVEL private
[simgrid.git]
/
src
/
simix
/
smx_host.c
diff --git
a/src/simix/smx_host.c
b/src/simix/smx_host.c
index
628ea05
..
bac8423
100644
(file)
--- a/
src/simix/smx_host.c
+++ b/
src/simix/smx_host.c
@@
-19,10
+19,10
@@
static void SIMIX_execution_finish(smx_synchro_t synchro);
/**
* \brief Internal function to create a SIMIX host.
* \param name name of the host to create
/**
* \brief Internal function to create a SIMIX host.
* \param name name of the host to create
- * \param data some user data (may be NULL)
*/
*/
-smx_host_t SIMIX_host_create(const char *name, void *data)
+void SIMIX_host_create(const char *name) // FIXME: braindead prototype. Take sg_host as parameter
{
{
+ sg_host_t host = xbt_lib_get_elm_or_null(host_lib, name);
smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
s_smx_process_t proc;
smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
s_smx_process_t proc;
@@
-31,18
+31,16
@@
smx_host_t SIMIX_host_create(const char *name, void *data)
xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
- xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host);
-
- return xbt_lib_get_elm_or_null(host_lib, name);
+ sg_host_simix_set(host, smx_host);
}
/**
* \brief Start the host if it is off
*
*/
}
/**
* \brief Start the host if it is off
*
*/
-void SIMIX_host_on(s
mx
_host_t h)
+void SIMIX_host_on(s
g
_host_t h)
{
{
- smx_host_priv_t host =
SIMIX_host_priv
(h);
+ smx_host_priv_t host =
sg_host_simix
(h);
xbt_assert((host != NULL), "Invalid parameters");
xbt_assert((host != NULL), "Invalid parameters");
@@
-87,7
+85,7
@@
void SIMIX_host_on(smx_host_t h)
}
}
}
}
-void simcall_HANDLER_host_off(smx_simcall_t simcall, s
mx
_host_t h)
+void simcall_HANDLER_host_off(smx_simcall_t simcall, s
g
_host_t h)
{
SIMIX_host_off(h, simcall->issuer);
}
{
SIMIX_host_off(h, simcall->issuer);
}
@@
-96,9
+94,9
@@
void simcall_HANDLER_host_off(smx_simcall_t simcall, smx_host_t h)
* \brief Stop the host if it is on
*
*/
* \brief Stop the host if it is on
*
*/
-void SIMIX_host_off(s
mx
_host_t h, smx_process_t issuer)
+void SIMIX_host_off(s
g
_host_t h, smx_process_t issuer)
{
{
- smx_host_priv_t host =
SIMIX_host_priv
(h);
+ smx_host_priv_t host =
sg_host_simix
(h);
xbt_assert((host != NULL), "Invalid parameters");
xbt_assert((host != NULL), "Invalid parameters");
@@
-110,7
+108,7
@@
void SIMIX_host_off(smx_host_t h, smx_process_t issuer)
smx_process_t process = NULL;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
smx_process_t process = NULL;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_name(process->
smx_
host), issuer->name);
+ XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_name(process->host), issuer->name);
}
}
}
}
}
}
@@
-119,7
+117,7
@@
void SIMIX_host_off(smx_host_t h, smx_process_t issuer)
/**
* \brief Internal function to destroy a SIMIX host.
*
/**
* \brief Internal function to destroy a SIMIX host.
*
- * \param h the host to destroy (a s
mx
_host_t)
+ * \param h the host to destroy (a s
g
_host_t)
*/
void SIMIX_host_destroy(void *h)
{
*/
void SIMIX_host_destroy(void *h)
{
@@
-150,15
+148,7
@@
void SIMIX_host_destroy(void *h)
return;
}
return;
}
-smx_host_t SIMIX_host_get_by_name(const char *name){
- xbt_assert(((simix_global != NULL)
- && (host_lib != NULL)),
- "Environment not set yet");
-
- return xbt_lib_get_elm_or_null(host_lib, name);
-}
-
-smx_host_t SIMIX_host_self(void)
+sg_host_t SIMIX_host_self(void)
{
smx_process_t process = SIMIX_process_self();
return (process == NULL) ? NULL : SIMIX_process_get_host(process);
{
smx_process_t process = SIMIX_process_self();
return (process == NULL) ? NULL : SIMIX_process_get_host(process);
@@
-168,67
+158,67
@@
smx_host_t SIMIX_host_self(void)
by exceptions and logging events */
const char* SIMIX_host_self_get_name(void)
{
by exceptions and logging events */
const char* SIMIX_host_self_get_name(void)
{
- s
mx
_host_t host = SIMIX_host_self();
+ s
g
_host_t host = SIMIX_host_self();
if (host == NULL || SIMIX_process_self() == simix_global->maestro_process)
return "";
return SIMIX_host_get_name(host);
}
if (host == NULL || SIMIX_process_self() == simix_global->maestro_process)
return "";
return SIMIX_host_get_name(host);
}
-xbt_dict_t SIMIX_host_get_properties(s
mx
_host_t host){
+xbt_dict_t SIMIX_host_get_properties(s
g
_host_t host){
return surf_host_get_properties(surf_host_resource_priv(host));
}
return surf_host_get_properties(surf_host_resource_priv(host));
}
-double SIMIX_host_get_speed(s
mx
_host_t host){
+double SIMIX_host_get_speed(s
g
_host_t host){
return surf_host_get_speed(host, 1.0);
}
return surf_host_get_speed(host, 1.0);
}
-int SIMIX_host_get_core(s
mx
_host_t host){
+int SIMIX_host_get_core(s
g
_host_t host){
return surf_host_get_core(host);
}
return surf_host_get_core(host);
}
-xbt_swag_t SIMIX_host_get_process_list(s
mx
_host_t host){
- smx_host_priv_t host_priv =
SIMIX_host_priv
(host);
+xbt_swag_t SIMIX_host_get_process_list(s
g
_host_t host){
+ smx_host_priv_t host_priv =
sg_host_simix
(host);
return host_priv->process_list;
}
return host_priv->process_list;
}
-double SIMIX_host_get_available_speed(s
mx
_host_t host){
+double SIMIX_host_get_available_speed(s
g
_host_t host){
return surf_host_get_available_speed(host);
}
return surf_host_get_available_speed(host);
}
-double SIMIX_host_get_current_power_peak(s
mx
_host_t host) {
+double SIMIX_host_get_current_power_peak(s
g
_host_t host) {
return surf_host_get_current_power_peak(host);
}
return surf_host_get_current_power_peak(host);
}
-double SIMIX_host_get_power_peak_at(s
mx
_host_t host, int pstate_index) {
+double SIMIX_host_get_power_peak_at(s
g
_host_t host, int pstate_index) {
return surf_host_get_power_peak_at(host, pstate_index);
}
return surf_host_get_power_peak_at(host, pstate_index);
}
-int SIMIX_host_get_nb_pstates(s
mx
_host_t host) {
+int SIMIX_host_get_nb_pstates(s
g
_host_t host) {
return surf_host_get_nb_pstates(host);
}
return surf_host_get_nb_pstates(host);
}
-void SIMIX_host_set_pstate(s
mx
_host_t host, int pstate_index) {
+void SIMIX_host_set_pstate(s
g
_host_t host, int pstate_index) {
surf_host_set_pstate(host, pstate_index);
}
surf_host_set_pstate(host, pstate_index);
}
-int SIMIX_host_get_pstate(s
mx
_host_t host) {
+int SIMIX_host_get_pstate(s
g
_host_t host) {
return surf_host_get_pstate(host);
}
return surf_host_get_pstate(host);
}
-double SIMIX_host_get_consumed_energy(s
mx
_host_t host) {
+double SIMIX_host_get_consumed_energy(s
g
_host_t host) {
return surf_host_get_consumed_energy(host);
}
return surf_host_get_consumed_energy(host);
}
-double SIMIX_host_get_wattmin_at(s
mx
_host_t host,int pstate) {
+double SIMIX_host_get_wattmin_at(s
g
_host_t host,int pstate) {
return surf_host_get_wattmin_at(host,pstate);
}
return surf_host_get_wattmin_at(host,pstate);
}
-double SIMIX_host_get_wattmax_at(s
mx
_host_t host,int pstate) {
+double SIMIX_host_get_wattmax_at(s
g
_host_t host,int pstate) {
return surf_host_get_wattmax_at(host,pstate);
}
return surf_host_get_wattmax_at(host,pstate);
}
-int SIMIX_host_get_state(s
mx
_host_t host){
+int SIMIX_host_get_state(s
g
_host_t host){
return surf_host_get_state(surf_host_resource_priv(host));
}
return surf_host_get_state(surf_host_resource_priv(host));
}
@@
-249,7
+239,7
@@
void _SIMIX_host_free_process_arg(void *data)
* The processes will only be restarted once, meaning that you will have to register the process
* again to restart the process again.
*/
* The processes will only be restarted once, meaning that you will have to register the process
* again to restart the process again.
*/
-void SIMIX_host_add_auto_restart_process(s
mx
_host_t host,
+void SIMIX_host_add_auto_restart_process(s
g
_host_t host,
const char *name,
xbt_main_func_t code,
void *data,
const char *name,
xbt_main_func_t code,
void *data,
@@
-259,8
+249,8
@@
void SIMIX_host_add_auto_restart_process(smx_host_t host,
xbt_dict_t properties,
int auto_restart)
{
xbt_dict_t properties,
int auto_restart)
{
- if (!
SIMIX_host_priv
(host)->auto_restart_processes) {
-
SIMIX_host_priv
(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
+ if (!
sg_host_simix
(host)->auto_restart_processes) {
+
sg_host_simix
(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
}
smx_process_arg_t arg = xbt_new(s_smx_process_arg_t,1);
arg->name = xbt_strdup(name);
}
smx_process_arg_t arg = xbt_new(s_smx_process_arg_t,1);
arg->name = xbt_strdup(name);
@@
-286,16
+276,16
@@
void SIMIX_host_add_auto_restart_process(smx_host_t host,
xbt_dict_set(watched_hosts_lib,sg_host_name(host),host,NULL);
XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host));
}
xbt_dict_set(watched_hosts_lib,sg_host_name(host),host,NULL);
XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host));
}
- xbt_dynar_push_as(
SIMIX_host_priv
(host)->auto_restart_processes,smx_process_arg_t,arg);
+ xbt_dynar_push_as(
sg_host_simix
(host)->auto_restart_processes,smx_process_arg_t,arg);
}
/**
* \brief Restart the list of processes that have been registered to the host
*/
}
/**
* \brief Restart the list of processes that have been registered to the host
*/
-void SIMIX_host_restart_processes(s
mx
_host_t host)
+void SIMIX_host_restart_processes(s
g
_host_t host)
{
unsigned int cpt;
smx_process_arg_t arg;
{
unsigned int cpt;
smx_process_arg_t arg;
- xbt_dynar_t process_list =
SIMIX_host_priv
(host)->auto_restart_processes;
+ xbt_dynar_t process_list =
sg_host_simix
(host)->auto_restart_processes;
if (!process_list)
return;
if (!process_list)
return;
@@
-338,7
+328,7
@@
void SIMIX_host_restart_processes(smx_host_t host)
xbt_dynar_reset(process_list);
}
xbt_dynar_reset(process_list);
}
-void SIMIX_host_autorestart(s
mx
_host_t host)
+void SIMIX_host_autorestart(s
g
_host_t host)
{
if(simix_global->autorestart)
simix_global->autorestart(host);
{
if(simix_global->autorestart)
simix_global->autorestart(host);
@@
-347,7
+337,7
@@
void SIMIX_host_autorestart(smx_host_t host)
}
smx_synchro_t SIMIX_host_execute(const char *name,
}
smx_synchro_t SIMIX_host_execute(const char *name,
- s
mx
_host_t host, double flops_amount, double priority, double bound, unsigned long affinity_mask){
+ s
g
_host_t host, double flops_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
smx_synchro_t synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
/* alloc structures and initialize */
smx_synchro_t synchro = xbt_mallocator_get(simix_global->synchro_mallocator);
@@
-385,7
+375,7
@@
smx_synchro_t SIMIX_host_execute(const char *name,
}
smx_synchro_t SIMIX_host_parallel_execute(const char *name,
}
smx_synchro_t SIMIX_host_parallel_execute(const char *name,
- int host_nb, s
mx
_host_t *host_list,
+ int host_nb, s
g
_host_t *host_list,
double *flops_amount, double *bytes_amount,
double amount, double rate){
double *flops_amount, double *bytes_amount,
double amount, double rate){
@@
-474,7
+464,7
@@
void SIMIX_host_execution_set_bound(smx_synchro_t synchro, double bound){
surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
}
surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
}
-void SIMIX_host_execution_set_affinity(smx_synchro_t synchro, s
mx
_host_t host, unsigned long mask){
+void SIMIX_host_execution_set_affinity(smx_synchro_t synchro, s
g
_host_t host, unsigned long mask){
xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE);
if (synchro->execution.surf_exec) {
xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE);
if (synchro->execution.surf_exec) {
@@
-531,7
+521,7
@@
void SIMIX_execution_finish(smx_synchro_t synchro)
break;
case SIMIX_FAILED:
break;
case SIMIX_FAILED:
- XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->
smx_
host));
+ XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->host));
simcall->issuer->context->iwannadie = 1;
SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
break;
simcall->issuer->context->iwannadie = 1;
SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
break;
@@
-546,7
+536,7
@@
void SIMIX_execution_finish(smx_synchro_t synchro)
(int)synchro->state);
}
/* check if the host is down */
(int)synchro->state);
}
/* check if the host is down */
- if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->
smx_
host)) != SURF_RESOURCE_ON) {
+ if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
simcall->issuer->context->iwannadie = 1;
}
@@
-601,28
+591,28
@@
void SIMIX_set_category(smx_synchro_t synchro, const char *category)
/**
* \brief Function to get the parameters of the given the SIMIX host.
*
/**
* \brief Function to get the parameters of the given the SIMIX host.
*
- * \param host the host to get_phys_host (a s
mx
_host_t)
+ * \param host the host to get_phys_host (a s
g
_host_t)
* \param param the parameter object space to be overwritten (a ws_params_t)
*/
* \param param the parameter object space to be overwritten (a ws_params_t)
*/
-void SIMIX_host_get_params(s
mx
_host_t ind_vm, ws_params_t params)
+void SIMIX_host_get_params(s
g
_host_t ind_vm, ws_params_t params)
{
/* jump to ws_get_params(). */
surf_host_get_params(ind_vm, params);
}
{
/* jump to ws_get_params(). */
surf_host_get_params(ind_vm, params);
}
-void SIMIX_host_set_params(s
mx
_host_t ind_vm, ws_params_t params)
+void SIMIX_host_set_params(s
g
_host_t ind_vm, ws_params_t params)
{
/* jump to ws_set_params(). */
surf_host_set_params(ind_vm, params);
}
{
/* jump to ws_set_params(). */
surf_host_set_params(ind_vm, params);
}
-xbt_dict_t SIMIX_host_get_mounted_storage_list(s
mx
_host_t host){
+xbt_dict_t SIMIX_host_get_mounted_storage_list(s
g
_host_t host){
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_host_get_mounted_storage_list(host);
}
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_host_get_mounted_storage_list(host);
}
-xbt_dynar_t SIMIX_host_get_attached_storage_list(s
mx
_host_t host){
+xbt_dynar_t SIMIX_host_get_attached_storage_list(s
g
_host_t host){
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_host_get_attached_storage_list(host);
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_host_get_attached_storage_list(host);