-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/**
* \brief Internal function to create a SIMIX host.
* \param name name of the host to create
- * \param data some user data (may be NULL)
*/
-sg_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;
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);
}
/**
*/
void SIMIX_host_on(sg_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");
unsigned int cpt;
smx_process_arg_t arg;
xbt_dynar_foreach(host->boot_processes,cpt,arg) {
- smx_process_t process;
char** argv = xbt_new(char*, arg->argc);
for (int i=0; i<arg->argc; i++)
XBT_DEBUG("Booting Process %s(%s) right now", arg->argv[0], arg->hostname);
if (simix_global->create_process_function) {
- simix_global->create_process_function(&process,
- argv[0],
+ simix_global->create_process_function(argv[0],
arg->code,
NULL,
arg->hostname,
arg->auto_restart,
NULL);
} else {
- simcall_process_create(&process,
- arg->argv[0],
+ simcall_process_create(arg->argv[0],
arg->code,
NULL,
arg->hostname,
*/
void SIMIX_host_off(sg_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");
return;
}
-sg_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);
-}
-
sg_host_t SIMIX_host_self(void)
{
smx_process_t process = SIMIX_process_self();
}
xbt_swag_t SIMIX_host_get_process_list(sg_host_t host){
- smx_host_priv_t host_priv = SIMIX_host_priv(host);
+ smx_host_priv_t host_priv = sg_host_simix(host);
return host_priv->process_list;
}
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);
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
{
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;
xbt_dynar_foreach (process_list, cpt, arg) {
- smx_process_t process;
-
XBT_DEBUG("Restarting Process %s(%s) right now", arg->argv[0], arg->hostname);
if (simix_global->create_process_function) {
- simix_global->create_process_function(&process,
- arg->argv[0],
+ simix_global->create_process_function(arg->argv[0],
arg->code,
NULL,
arg->hostname,
arg->auto_restart,
NULL);
} else {
- simcall_process_create(&process,
- arg->argv[0],
+ simcall_process_create(arg->argv[0],
arg->code,
NULL,
arg->hostname,
else
xbt_die("No function for simix_global->autorestart");
}
-
-smx_synchro_t SIMIX_host_execute(const char *name,
- sg_host_t host, double flops_amount, double priority, double bound, unsigned long affinity_mask){
+smx_synchro_t simcall_HANDLER_process_execute(smx_simcall_t simcall,
+ const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) {
+ return SIMIX_process_execute(simcall->issuer, name,flops_amount,priority,bound,affinity_mask);
+}
+smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
+ 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);
synchro->type = SIMIX_SYNC_EXECUTE;
synchro->name = xbt_strdup(name);
synchro->state = SIMIX_RUNNING;
- synchro->execution.host = host;
+ synchro->execution.host = issuer->host;
synchro->category = NULL;
/* set surf's action */
if (!MC_is_active() && !MC_record_replay_is_active()) {
- synchro->execution.surf_exec = surf_host_execute(host, flops_amount);
+ synchro->execution.surf_exec = surf_host_execute(issuer->host, flops_amount);
surf_action_set_data(synchro->execution.surf_exec, synchro);
surf_action_set_priority(synchro->execution.surf_exec, priority);
* surf layer should not be zero (i.e., unlimited). It should be the
* capacity of a CPU core. */
if (bound == 0)
- surf_cpu_action_set_bound(synchro->execution.surf_exec, SIMIX_host_get_speed(host));
+ surf_cpu_action_set_bound(synchro->execution.surf_exec, SIMIX_host_get_speed(issuer->host));
else
surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
if (affinity_mask != 0) {
/* just a double check to confirm that this host is the host where this task is running. */
- xbt_assert(synchro->execution.host == host);
- surf_cpu_action_set_affinity(synchro->execution.surf_exec, host, affinity_mask);
+ xbt_assert(synchro->execution.host == issuer->host);
+ surf_cpu_action_set_affinity(synchro->execution.surf_exec, issuer->host, affinity_mask);
}
}
return synchro;
}
-smx_synchro_t SIMIX_host_parallel_execute(const char *name,
+smx_synchro_t SIMIX_process_parallel_execute(const char *name,
int host_nb, sg_host_t *host_list,
double *flops_amount, double *bytes_amount,
double amount, double rate){
- void **surf_host_list = NULL;
+ sg_host_t*host_list_cpy = NULL;
int i;
/* alloc structures and initialize */
synchro->category = NULL;
/* set surf's synchro */
- surf_host_list = xbt_new0(void *, host_nb);
+ host_list_cpy = xbt_new0(sg_host_t, host_nb);
for (i = 0; i < host_nb; i++)
- surf_host_list[i] = surf_host_resource_priv(host_list[i]);
+ host_list_cpy[i] = host_list[i];
/* FIXME: what happens if host_list contains VMs and PMs. If
/* set surf's synchro */
if (!MC_is_active() && !MC_record_replay_is_active()) {
synchro->execution.surf_exec =
- surf_host_model_execute_parallel_task((surf_host_model_t)surf_host_model,
- host_nb, surf_host_list, flops_amount, bytes_amount, rate);
+ surf_host_model_execute_parallel_task(surf_host_model,
+ host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
surf_action_set_data(synchro->execution.surf_exec, synchro);
}
return synchro;
}
-void SIMIX_host_execution_destroy(smx_synchro_t synchro){
+void SIMIX_process_execution_destroy(smx_synchro_t synchro){
XBT_DEBUG("Destroy synchro %p", synchro);
if (synchro->execution.surf_exec) {
xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
}
-void SIMIX_host_execution_cancel(smx_synchro_t synchro){
+void SIMIX_process_execution_cancel(smx_synchro_t synchro){
XBT_DEBUG("Cancel synchro %p", synchro);
if (synchro->execution.surf_exec)
surf_action_cancel(synchro->execution.surf_exec);
}
-double SIMIX_host_execution_get_remains(smx_synchro_t synchro){
+double SIMIX_process_execution_get_remains(smx_synchro_t synchro){
double result = 0.0;
if (synchro->state == SIMIX_RUNNING)
return result;
}
-e_smx_state_t SIMIX_host_execution_get_state(smx_synchro_t synchro){
+e_smx_state_t SIMIX_process_execution_get_state(smx_synchro_t synchro){
return synchro->state;
}
-void SIMIX_host_execution_set_priority(smx_synchro_t synchro, double priority){
+void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority){
if(synchro->execution.surf_exec)
surf_action_set_priority(synchro->execution.surf_exec, priority);
}
-void SIMIX_host_execution_set_bound(smx_synchro_t synchro, double bound){
+void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound){
if(synchro->execution.surf_exec)
surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
}
-void SIMIX_host_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){
+void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){
xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE);
if (synchro->execution.surf_exec) {
}
}
-void simcall_HANDLER_host_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro){
+void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro){
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state);
}
simcall->issuer->waiting_synchro = NULL;
- simcall_host_execution_wait__set__result(simcall, synchro->state);
+ simcall_process_execution_wait__set__result(simcall, synchro->state);
SIMIX_simcall_answer(simcall);
}
/* We no longer need it */
- SIMIX_host_execution_destroy(synchro);
+ SIMIX_process_execution_destroy(synchro);
}
* \param host the host to get_phys_host (a sg_host_t)
* \param param the parameter object space to be overwritten (a ws_params_t)
*/
-void SIMIX_host_get_params(sg_host_t ind_vm, ws_params_t params)
+void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params)
{
/* jump to ws_get_params(). */
surf_host_get_params(ind_vm, params);
}
-void SIMIX_host_set_params(sg_host_t ind_vm, ws_params_t params)
+void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params)
{
/* jump to ws_set_params(). */
surf_host_set_params(ind_vm, params);
