-/* 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
#include "xbt/log.h"
#include "xbt/dict.h"
#include "mc/mc.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
* \brief Internal function to create a SIMIX host.
* \param name name of the host to create
*/
-void SIMIX_host_create(const char *name) // FIXME: braindead prototype. Take sg_host as parameter
+void SIMIX_host_create(sg_host_t host) // 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;
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,
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->host), issuer->name);
+ XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_get_name(process->host), issuer->name);
}
}
}
return surf_host_get_properties(surf_host_resource_priv(host));
}
-double SIMIX_host_get_speed(sg_host_t host){
- return surf_host_get_speed(host, 1.0);
-}
-
-int SIMIX_host_get_core(sg_host_t host){
- return surf_host_get_core(host);
-}
xbt_swag_t SIMIX_host_get_process_list(sg_host_t host){
smx_host_priv_t host_priv = sg_host_simix(host);
}
-double SIMIX_host_get_available_speed(sg_host_t host){
- return surf_host_get_available_speed(host);
-}
-
double SIMIX_host_get_current_power_peak(sg_host_t host) {
return surf_host_get_current_power_peak(host);
}
return surf_host_get_power_peak_at(host, pstate_index);
}
-int SIMIX_host_get_nb_pstates(sg_host_t host) {
- return surf_host_get_nb_pstates(host);
-}
-
-
void SIMIX_host_set_pstate(sg_host_t host, int pstate_index) {
surf_host_set_pstate(host, pstate_index);
}
-int SIMIX_host_get_pstate(sg_host_t host) {
- return surf_host_get_pstate(host);
-}
-
-double SIMIX_host_get_consumed_energy(sg_host_t host) {
- return surf_host_get_consumed_energy(host);
-}
double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) {
return surf_host_get_wattmin_at(host,pstate);
}
return surf_host_get_wattmax_at(host,pstate);
}
-int SIMIX_host_get_state(sg_host_t host){
- return surf_host_get_state(surf_host_resource_priv(host));
-}
-
void _SIMIX_host_free_process_arg(void *data)
{
smx_process_arg_t arg = *(void**)data;
arg->properties = properties;
arg->auto_restart = auto_restart;
- if( SIMIX_host_get_state(host) == SURF_RESOURCE_OFF
- && !xbt_dict_get_or_null(watched_hosts_lib,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));
+ if( sg_host_get_state(host) == SURF_RESOURCE_OFF
+ && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
+ xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,NULL);
+ XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
}
xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg);
}
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, sg_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){
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);
break;
case SIMIX_FAILED:
- XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->host));
+ XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_get_name(simcall->issuer->host));
simcall->issuer->context->iwannadie = 1;
SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
break;
}
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);
}
