X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de918b84a9c196fd5f96e15eb6e6f06f4f4d051a..c619840016c55d24574d34f85fa417fcaf60f5d3:/src/simix/smx_vm.c

diff --git a/src/simix/smx_vm.c b/src/simix/smx_vm.c
index 1aff24ed11..8d82b17f5b 100644
--- a/src/simix/smx_vm.c
+++ b/src/simix/smx_vm.c
@@ -68,7 +68,7 @@ void SIMIX_pre_vm_start(smx_simcall_t simcall, smx_host_t vm){
 
 /* ***** set/get state of a VM ***** */
 void SIMIX_set_vm_state(smx_host_t vm, int state){
-
+	surf_vm_workstation_model->extension.vm_workstation.set_state(vm, state);
 }
 void SIMIX_prev_set_vm_state(smx_host_t vm, int state){
 	SIMIX_set_vm_state(vm, state);
@@ -96,473 +96,12 @@ void SIMIX_vm_destroy(smx_host_t host)
   smx_host_priv_t host_priv = SIMIX_host_priv(host);
 
   /* this will call the registered callback function, i.e., SIMIX_host_destroy().  */
-  xbt_lib_unset(host_lib, name, SIMIX_HOST_LEVEL)
+  xbt_lib_unset(host_lib, hostname, SIMIX_HOST_LEVEL);
 
   /* jump to vm_ws_destroy(). The surf level resource will be freed. */
-  surf_vm_workstation_model->extension.vm_workstation.destroy(hostname);
+  surf_vm_workstation_model->extension.vm_workstation.destroy(host);
 }
 
 void SIMIX_pre_vm_destroy(smx_simcall_t simcall, smx_host_t vm){
-   SIMIX_vm_start(vm);
-}
-
-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)
-{
-  smx_process_t process = SIMIX_process_self();
-  return (process == NULL) ? NULL : SIMIX_process_get_host(process);
-}
-
-const char* SIMIX_pre_host_self_get_name(smx_simcall_t simcall){
-   return SIMIX_host_self_get_name();
-}
-/* needs to be public and without simcall because it is called
-   by exceptions and logging events */
-const char* SIMIX_host_self_get_name(void)
-{
-  smx_host_t host = SIMIX_host_self();
-  if (host == NULL || SIMIX_process_self() == simix_global->maestro_process)
-    return "";
-
-  return SIMIX_host_get_name(host);
-}
-
-const char* SIMIX_pre_host_get_name(smx_simcall_t simcall, smx_host_t host){
-   return SIMIX_host_get_name(host);
-}
-const char* SIMIX_host_get_name(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters");
-
-  return sg_host_name(host);
-}
-
-xbt_dict_t SIMIX_pre_host_get_properties(smx_simcall_t simcall, smx_host_t host){
-  return SIMIX_host_get_properties(host);
-}
-xbt_dict_t SIMIX_host_get_properties(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
-  return surf_workstation_model->extension.workstation.get_properties(host);
-}
-
-double SIMIX_pre_host_get_speed(smx_simcall_t simcall, smx_host_t host){
-  return SIMIX_host_get_speed(host);
-}
-double SIMIX_host_get_speed(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
-  return surf_workstation_model->extension.workstation.
-      get_speed(host, 1.0);
-}
-
-double SIMIX_pre_host_get_available_speed(smx_simcall_t simcall, smx_host_t host){
-  return SIMIX_host_get_available_speed(host);
-}
-double SIMIX_host_get_available_speed(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
-  return surf_workstation_model->extension.workstation.
-      get_available_speed(host);
-}
-
-int SIMIX_pre_host_get_state(smx_simcall_t simcall, smx_host_t host){
-  return SIMIX_host_get_state(host);
-}
-int SIMIX_host_get_state(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
-  return surf_workstation_model->extension.workstation.
-      get_state(host);
-}
-
-void* SIMIX_pre_host_self_get_data(smx_simcall_t simcall){
-  return SIMIX_host_self_get_data();
-}
-void* SIMIX_host_self_get_data(void)
-{
-  smx_host_t self = SIMIX_host_self();
-  return SIMIX_host_get_data(self);
-}
-
-void SIMIX_host_self_set_data(void *data)
-{
-  smx_host_t self = SIMIX_host_self();
-  SIMIX_host_set_data(self, data);
-}
-
-void* SIMIX_pre_host_get_data(smx_simcall_t simcall,smx_host_t host){
-  return SIMIX_host_get_data(host);
-}
-void* SIMIX_host_get_data(smx_host_t host){
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
-  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;
-  xbt_free(arg->name);
-  xbt_free(arg);
-}
-/**
- * \brief Add a process to the list of the processes that the host will restart when it comes back
- * This function add a process to the list of the processes that will be restarted when the host comes
- * back. It is expected that this function is called when the host is down.
- * 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(smx_host_t host,
-                                         const char *name,
-                                         xbt_main_func_t code,
-                                         void *data,
-                                         const char *hostname,
-                                         double kill_time,
-                                         int argc, char **argv,
-                                         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);
-  }
-  smx_process_arg_t arg = xbt_new(s_smx_process_arg_t,1);
-  arg->name = xbt_strdup(name);
-  arg->code = code;
-  arg->data = data;
-  arg->hostname = hostname;
-  arg->kill_time = kill_time;
-  arg->argc = argc;
-
-  arg->argv = xbt_new(char*,argc + 1);
-
-  int i;
-  for (i = 0; i < argc; i++) {
-    arg->argv[i] = xbt_strdup(argv[i]);
-  }
-  arg->argv[argc] = NULL;
-
-  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 push 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);
-}
-/**
- * \brief Restart the list of processes that have been registered to the host
- */
-void SIMIX_host_restart_processes(smx_host_t host)
-{
-  unsigned int cpt;
-  smx_process_arg_t arg;
-  xbt_dynar_foreach(SIMIX_host_priv(host)->auto_restart_processes,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],
-                                            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);
-
-    }
-  }
-  xbt_dynar_reset(SIMIX_host_priv(host)->auto_restart_processes);
-}
-
-void SIMIX_host_autorestart(smx_host_t host)
-{
-  if(simix_global->autorestart)
-    simix_global->autorestart(host);
-  else
-    xbt_die("No function for simix_global->autorestart");
-}
-
-void SIMIX_pre_host_set_data(smx_simcall_t simcall, smx_host_t host, void *data) {
-  SIMIX_host_set_data(host, data);
-}
-void SIMIX_host_set_data(smx_host_t host, void *data){
-  xbt_assert((host != NULL), "Invalid parameters");
-  xbt_assert((SIMIX_host_priv(host)->data == NULL), "Data already set");
-
-  SIMIX_host_priv(host)->data = data;
+   SIMIX_vm_destroy(vm);
 }
-
-smx_action_t SIMIX_pre_host_execute(smx_simcall_t simcall,const char *name,
-    smx_host_t host, double computation_amount, double priority){
-  return SIMIX_host_execute(name, host, computation_amount, priority);
-}
-smx_action_t SIMIX_host_execute(const char *name,
-    smx_host_t host, double computation_amount, double priority){
-
-  /* alloc structures and initialize */
-  smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
-  action->type = SIMIX_ACTION_EXECUTE;
-  action->name = xbt_strdup(name);
-  action->state = SIMIX_RUNNING;
-  action->execution.host = host;
-
-#ifdef HAVE_TRACING
-  action->category = NULL;
-#endif
-
-  /* set surf's action */
-  if (!MC_is_active()) {
-    action->execution.surf_exec =
-      surf_workstation_model->extension.workstation.execute(host,
-    computation_amount);
-    surf_workstation_model->action_data_set(action->execution.surf_exec, action);
-    surf_workstation_model->set_priority(action->execution.surf_exec, priority);
-  }
-
-  XBT_DEBUG("Create execute action %p", action);
-
-  return action;
-}
-
-smx_action_t SIMIX_pre_host_parallel_execute(smx_simcall_t simcall, const char *name,
-    int host_nb, smx_host_t *host_list,
-    double *computation_amount, double *communication_amount,
-    double amount, double rate){
-  return SIMIX_host_parallel_execute(name, host_nb, host_list, computation_amount,
-		                     communication_amount, amount, rate);
-}
-smx_action_t SIMIX_host_parallel_execute(const char *name,
-    int host_nb, smx_host_t *host_list,
-    double *computation_amount, double *communication_amount,
-    double amount, double rate){
-
-  void **workstation_list = NULL;
-  int i;
-
-  /* alloc structures and initialize */
-  smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
-  action->type = SIMIX_ACTION_PARALLEL_EXECUTE;
-  action->name = xbt_strdup(name);
-  action->state = SIMIX_RUNNING;
-  action->execution.host = NULL; /* FIXME: do we need the list of hosts? */
-
-#ifdef HAVE_TRACING
-  action->category = NULL;
-#endif
-
-  /* set surf's action */
-  workstation_list = xbt_new0(void *, host_nb);
-  for (i = 0; i < host_nb; i++)
-    workstation_list[i] = host_list[i];
-
-  /* set surf's action */
-  if (!MC_is_active()) {
-    action->execution.surf_exec =
-      surf_workstation_model->extension.workstation.
-      execute_parallel_task(host_nb, workstation_list, computation_amount,
-                      communication_amount, rate);
-
-    surf_workstation_model->action_data_set(action->execution.surf_exec, action);
-  }
-  XBT_DEBUG("Create parallel execute action %p", action);
-
-  return action;
-}
-
-void SIMIX_pre_host_execution_destroy(smx_simcall_t simcall, smx_action_t action){
-  SIMIX_host_execution_destroy(action);
-}
-void SIMIX_host_execution_destroy(smx_action_t action){
-  XBT_DEBUG("Destroy action %p", action);
-
-  if (action->execution.surf_exec) {
-    surf_workstation_model->action_unref(action->execution.surf_exec);
-    action->execution.surf_exec = NULL;
-  }
-  xbt_free(action->name);
-  xbt_mallocator_release(simix_global->action_mallocator, action);
-}
-
-void SIMIX_pre_host_execution_cancel(smx_simcall_t simcall, smx_action_t action){
-  SIMIX_host_execution_cancel(action);
-}
-void SIMIX_host_execution_cancel(smx_action_t action){
-  XBT_DEBUG("Cancel action %p", action);
-
-  if (action->execution.surf_exec)
-    surf_workstation_model->action_cancel(action->execution.surf_exec);
-}
-
-double SIMIX_pre_host_execution_get_remains(smx_simcall_t simcall, smx_action_t action){
-  return SIMIX_host_execution_get_remains(action);
-}
-double SIMIX_host_execution_get_remains(smx_action_t action){
-  double result = 0.0;
-
-  if (action->state == SIMIX_RUNNING)
-    result = surf_workstation_model->get_remains(action->execution.surf_exec);
-
-  return result;
-}
-
-e_smx_state_t SIMIX_pre_host_execution_get_state(smx_simcall_t simcall, smx_action_t action){
-  return SIMIX_host_execution_get_state(action);
-}
-e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action){
-  return action->state;
-}
-
-void SIMIX_pre_host_execution_set_priority(smx_simcall_t simcall, smx_action_t action,
-		                        double priority){
-  return SIMIX_host_execution_set_priority(action, priority);
-}
-void SIMIX_host_execution_set_priority(smx_action_t action, double priority){
-  if(action->execution.surf_exec)
-    surf_workstation_model->set_priority(action->execution.surf_exec, priority);
-}
-
-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);
-
-  /* Associate this simcall to the action */
-  xbt_fifo_push(action->simcalls, simcall);
-  simcall->issuer->waiting_action = action;
-
-  /* set surf's action */
-  if (MC_is_active()) {
-    action->state = SIMIX_DONE;
-    SIMIX_execution_finish(action);
-    return;
-  }
-
-  /* If the action is already finished then perform the error handling */
-  if (action->state != SIMIX_RUNNING)
-    SIMIX_execution_finish(action);
-}
-
-void SIMIX_host_execution_suspend(smx_action_t action)
-{
-  if(action->execution.surf_exec)
-    surf_workstation_model->suspend(action->execution.surf_exec);
-}
-
-void SIMIX_host_execution_resume(smx_action_t action)
-{
-  if(action->execution.surf_exec)
-    surf_workstation_model->resume(action->execution.surf_exec);
-}
-
-void SIMIX_execution_finish(smx_action_t action)
-{
-  xbt_fifo_item_t item;
-  smx_simcall_t simcall;
-
-  xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) {
-
-    switch (action->state) {
-
-      case SIMIX_DONE:
-        /* do nothing, action done */
-  XBT_DEBUG("SIMIX_execution_finished: execution successful");
-        break;
-
-      case SIMIX_FAILED:
-        XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->smx_host));
-        simcall->issuer->context->iwannadie = 1;
-        //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
-        break;
-
-      case SIMIX_CANCELED:
-        XBT_DEBUG("SIMIX_execution_finished: execution canceled");
-        SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
-        break;
-
-      default:
-        xbt_die("Internal error in SIMIX_execution_finish: unexpected action state %d",
-            (int)action->state);
-    }
-    /* check if the host is down */
-    if (surf_workstation_model->extension.
-        workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) {
-      simcall->issuer->context->iwannadie = 1;
-    }
-
-    simcall->issuer->waiting_action =    NULL;
-    simcall_host_execution_wait__set__result(simcall, action->state);
-    SIMIX_simcall_answer(simcall);
-  }
-
-  /* We no longer need it */
-  SIMIX_host_execution_destroy(action);
-}
-
-void SIMIX_post_host_execute(smx_action_t action)
-{
-  if (action->type == SIMIX_ACTION_EXECUTE && /* FIMXE: handle resource failure
-                                               * for parallel tasks too */
-      surf_workstation_model->extension.workstation.get_state(action->execution.host) == SURF_RESOURCE_OFF) {
-    /* If the host running the action failed, notice it so that the asking
-     * process can be killed if it runs on that host itself */
-    action->state = SIMIX_FAILED;
-  } else if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED) {
-    /* If the host running the action didn't fail, then the action was
-     * canceled */
-    action->state = SIMIX_CANCELED;
-  } else {
-    action->state = SIMIX_DONE;
-  }
-
-  if (action->execution.surf_exec) {
-    surf_workstation_model->action_unref(action->execution.surf_exec);
-    action->execution.surf_exec = NULL;
-  }
-
-  /* If there are simcalls associated with the action, then answer them */
-  if (xbt_fifo_size(action->simcalls)) {
-    SIMIX_execution_finish(action);
-  }
-}
-
-
-#ifdef HAVE_TRACING
-void SIMIX_pre_set_category(smx_simcall_t simcall, smx_action_t action,
-		            const char *category){
-  SIMIX_set_category(action, category);
-}
-void SIMIX_set_category(smx_action_t action, const char *category)
-{
-  if (action->state != SIMIX_RUNNING) return;
-  if (action->type == SIMIX_ACTION_EXECUTE){
-    surf_workstation_model->set_category(action->execution.surf_exec, category);
-  }else if (action->type == SIMIX_ACTION_COMMUNICATE){
-    surf_workstation_model->set_category(action->comm.surf_comm, category);
-  }
-}
-#endif
-