*/
void SIMIX_host_on(smx_host_t h)
{
- smx_host_priv_t host = (smx_host_priv_t) h;
+ smx_host_priv_t host = SIMIX_host_priv(h);
xbt_assert((host != NULL), "Invalid parameters");
-
- surf_model_t ws_model = surf_resource_model(h, SURF_WKS_LEVEL);
- ws_model->extension.workstation.set_state(host, SURF_RESOURCE_ON);
- SIMIX_host_restart_processes(h);
+ surf_model_t ws_model = surf_resource_model(h, SURF_WKS_LEVEL);
+ if (ws_model->extension.workstation.get_state(h)==SURF_RESOURCE_OFF) {
+ ws_model->extension.workstation.set_state(h, SURF_RESOURCE_ON);
+ unsigned int cpt;
+ smx_process_arg_t arg;
+ xbt_dynar_foreach(host->boot_processes,cpt,arg) {
+ smx_process_t process;
+
+ 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,
+ arg->argv[0],
+ arg->code,
+ NULL,
+ arg->hostname,
+ arg->kill_time,
+ arg->argc,
+ arg->argv,
+ arg->properties,
+ arg->auto_restart);
+ }
+ else {
+ simcall_process_create(&process,
+ arg->argv[0],
+ arg->code,
+ NULL,
+ arg->hostname,
+ arg->kill_time,
+ arg->argc,
+ arg->argv,
+ arg->properties,
+ arg->auto_restart);
+ }
+ }
+ }
}
void SIMIX_pre_host_off(smx_simcall_t simcall, smx_host_t h)
{
- SIMIX_host_off(h);
+ SIMIX_host_off(h, simcall->issuer);
}
/**
* \brief Stop the host if it is on
*
*/
-void SIMIX_host_off(smx_host_t h)
+void SIMIX_host_off(smx_host_t h, smx_process_t issuer)
{
- smx_host_priv_t host = (smx_host_priv_t) h;
+ smx_host_priv_t host = SIMIX_host_priv(h);
xbt_assert((host != NULL), "Invalid parameters");
-
- /* Clean Simulator data */
- if (xbt_swag_size(host->process_list) != 0) {
- char *msg = xbt_strdup("Shutting down host, but it's not empty:");
- char *tmp;
- smx_process_t process = NULL;
-
- xbt_swag_foreach(process, host->process_list) {
- tmp = bprintf("%s\n\t%s", msg, process->name);
- free(msg);
- msg = tmp;
+
+ surf_model_t ws_model = surf_resource_model(h, SURF_WKS_LEVEL);
+ if (ws_model->extension.workstation.get_state(h)==SURF_RESOURCE_ON) {
+ ws_model->extension.workstation.set_state(h, SURF_RESOURCE_OFF);
+
+ /* Clean Simulator data */
+ if (xbt_swag_size(host->process_list) != 0) {
+ 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);
+ }
}
- SIMIX_display_process_status();
- THROWF(arg_error, 0, "%s", msg);
}
- xbt_swag_free(host->process_list);
-
- surf_model_t ws_model = surf_resource_model(h, SURF_WKS_LEVEL);
- ws_model->extension.workstation.set_state(host, SURF_RESOURCE_OFF);
}
/**
THROWF(arg_error, 0, "%s", msg);
}
xbt_dynar_free(&host->auto_restart_processes);
+ xbt_dynar_free(&host->boot_processes);
xbt_swag_free(host->process_list);
/* Clean host structure */
return SIMIX_host_priv(host)->data;
}
-void _SIMIX_host_free_process_arg(void *);
+
void _SIMIX_host_free_process_arg(void *data)
{
smx_process_arg_t arg = *(void**)data;
}
smx_action_t SIMIX_pre_host_execute(smx_simcall_t simcall,const char *name,
- smx_host_t host, double computation_amount, double priority, double bound){
- return SIMIX_host_execute(name, host, computation_amount, priority, bound);
+ smx_host_t host, double computation_amount, double priority, double bound, unsigned long affinity_mask){
+ return SIMIX_host_execute(name, host, computation_amount, priority, bound, affinity_mask);
}
smx_action_t SIMIX_host_execute(const char *name,
- smx_host_t host, double computation_amount, double priority, double bound){
+ smx_host_t host, double computation_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
action->execution.surf_exec = ws_model->extension.workstation.execute(host, computation_amount);
ws_model->action_data_set(action->execution.surf_exec, action);
ws_model->set_priority(action->execution.surf_exec, priority);
- ws_model->set_bound(action->execution.surf_exec, bound);
+
+ /* Note (hypervisor): for multicore, the bound value being passed to the
+ * surf layer should not be zero (i.e., unlimited). It should be the
+ * capacity of a CPU core. */
+ if (bound == 0)
+ ws_model->set_bound(action->execution.surf_exec, SIMIX_host_get_speed(host));
+ else
+ ws_model->set_bound(action->execution.surf_exec, bound);
+
+ if (affinity_mask != 0)
+ ws_model->set_affinity(action->execution.surf_exec, host, affinity_mask);
}
XBT_DEBUG("Create execute action %p", action);
ws_model->set_bound(action->execution.surf_exec, bound);
}
+void SIMIX_pre_host_execution_set_affinity(smx_simcall_t simcall,
+ smx_action_t action, smx_host_t host, unsigned long mask){
+ SIMIX_host_execution_set_affinity(action, host, mask);
+}
+void SIMIX_host_execution_set_affinity(smx_action_t action, smx_host_t host, unsigned long mask){
+ surf_model_t ws_model = get_ws_model_from_action(action);
+
+ if(action->execution.surf_exec)
+ ws_model->set_affinity(action->execution.surf_exec, host, mask);
+}
+
void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action){
XBT_DEBUG("Wait for execution of action %p, state %d", action, (int)action->state);