X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..104ec12984d49e726b38234c5d8ecbfd3732b91e:/src/simix/smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index e8d184a7a0..451ddcc5b3 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -8,6 +8,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
+#include "mc/mc.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
                                 "Logging specific to SIMIX (hosts)");
@@ -35,8 +36,7 @@ smx_host_t SIMIX_host_create(const char *name,
       xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
 
   /* Update global variables */
-  xbt_dict_set(simix_global->host, smx_host->name, smx_host,
-               &SIMIX_host_destroy);
+  xbt_lib_set(host_lib,smx_host->name,SIMIX_HOST_LEVEL,smx_host);
 
   return smx_host;
 }
@@ -50,7 +50,7 @@ void SIMIX_host_destroy(void *h)
 {
   smx_host_t host = (smx_host_t) h;
 
-  xbt_assert0((host != NULL), "Invalid parameters");
+  xbt_assert((host != NULL), "Invalid parameters");
 
   /* Clean Simulator data */
   if (xbt_swag_size(host->process_list) != 0) {
@@ -65,7 +65,7 @@ void SIMIX_host_destroy(void *h)
       msg = tmp;
     }
     SIMIX_display_process_status();
-    THROW1(arg_error, 0, "%s", msg);
+    THROWF(arg_error, 0, "%s", msg);
   }
 
   xbt_swag_free(host->process_list);
@@ -84,16 +84,25 @@ void SIMIX_host_destroy(void *h)
  */
 xbt_dict_t SIMIX_host_get_dict(void)
 {
-  return simix_global->host;
+  xbt_dict_t host_dict = xbt_dict_new();
+  xbt_lib_cursor_t cursor = NULL;
+  char *name = NULL;
+  void **host = NULL;
+
+  xbt_lib_foreach(host_lib, cursor, name, host){
+	  if(host[SIMIX_HOST_LEVEL])
+		  xbt_dict_set(host_dict,name,host[SIMIX_HOST_LEVEL],NULL);
+  }
+  return host_dict;
 }
 
 smx_host_t SIMIX_host_get_by_name(const char *name)
 {
-  xbt_assert0(((simix_global != NULL)
-               && (simix_global->host != NULL)),
+  xbt_assert(((simix_global != NULL)
+               && (host_lib != NULL)),
               "Environment not set yet");
 
-  return xbt_dict_get_or_null(simix_global->host, name);
+  return xbt_lib_get_or_null(host_lib, name, SIMIX_HOST_LEVEL);
 }
 
 smx_host_t SIMIX_host_self(void)
@@ -115,21 +124,21 @@ const char* SIMIX_host_self_get_name(void)
 
 const char* SIMIX_host_get_name(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
+  xbt_assert((host != NULL), "Invalid parameters");
 
   return host->name;
 }
 
 xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
   return surf_workstation_model->extension.workstation.get_properties(host->host);
 }
 
 double SIMIX_host_get_speed(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
   return surf_workstation_model->extension.workstation.
       get_speed(host->host, 1.0);
@@ -137,7 +146,7 @@ double SIMIX_host_get_speed(smx_host_t host)
 
 double SIMIX_host_get_available_speed(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
   return surf_workstation_model->extension.workstation.
       get_available_speed(host->host);
@@ -145,7 +154,7 @@ double SIMIX_host_get_available_speed(smx_host_t host)
 
 int SIMIX_host_get_state(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
   return surf_workstation_model->extension.workstation.
       get_state(host->host);
@@ -163,52 +172,45 @@ void SIMIX_host_self_set_data(void *data)
 
 void* SIMIX_host_get_data(smx_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
 
   return host->data;
 }
 
 void SIMIX_host_set_data(smx_host_t host, void *data)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
-  xbt_assert0((host->data == NULL), "Data already set");
+  xbt_assert((host != NULL), "Invalid parameters");
+  xbt_assert((host->data == NULL), "Data already set");
 
   host->data = data;
 }
 
 smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
-                                double computation_amount)
+                                double computation_amount,
+                                double priority)
 {
   /* alloc structures and initialize */
-  smx_action_t action = xbt_new0(s_smx_action_t, 1);
+  smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
   action->type = SIMIX_ACTION_EXECUTE;
   action->name = xbt_strdup(name);
-  action->request_list = xbt_fifo_new();
   action->state = SIMIX_RUNNING;
   action->execution.host = host;
-  
+
 #ifdef HAVE_TRACING
   action->category = NULL;
 #endif
 
-#ifdef HAVE_MC
   /* set surf's action */
-  if(!_surf_do_model_check)
-#endif
-  {
-  action->execution.surf_exec =
-    surf_workstation_model->extension.workstation.execute(host->host, 
-                                                          computation_amount);
-  surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+  if (!MC_IS_ENABLED) {
+    action->execution.surf_exec =
+      surf_workstation_model->extension.workstation.execute(host->host,
+	  computation_amount);
+    surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+    surf_workstation_model->set_priority(action->execution.surf_exec, priority);
   }
-  
-#ifdef HAVE_TRACING
-  TRACE_smx_host_execute(action);
-  TRACE_surf_action(action->execution.surf_exec, action->category);
-#endif
 
-  DEBUG1("Create execute action %p", action);
-  
+  XBT_DEBUG("Create execute action %p", action);
+
   return action;
 }
 
@@ -221,13 +223,12 @@ smx_action_t SIMIX_host_parallel_execute( const char *name,
   int i;
 
   /* alloc structures and initialize */
-  smx_action_t action = xbt_new0(s_smx_action_t, 1);
+  smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
   action->type = SIMIX_ACTION_PARALLEL_EXECUTE;
   action->name = xbt_strdup(name);
-  action->request_list = xbt_fifo_new();
   action->state = SIMIX_RUNNING;
   action->execution.host = NULL; /* FIXME: do we need the list of hosts? */
- 
+
 #ifdef HAVE_TRACING
   action->category = NULL;
 #endif
@@ -237,56 +238,47 @@ smx_action_t SIMIX_host_parallel_execute( const char *name,
   for (i = 0; i < host_nb; i++)
     workstation_list[i] = host_list[i]->host;
 
-#ifdef HAVE_MC
   /* set surf's action */
-  if(!_surf_do_model_check)
-#endif  
-  {
-  action->execution.surf_exec = 
-    surf_workstation_model->extension.workstation.
-    execute_parallel_task(host_nb, workstation_list, computation_amount,
-                          communication_amount, amount, rate);
-
-  surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+  if (!MC_IS_ENABLED) {
+    action->execution.surf_exec =
+      surf_workstation_model->extension.workstation.
+      execute_parallel_task(host_nb, workstation_list, computation_amount,
+	                    communication_amount, amount, rate);
+
+    surf_workstation_model->action_data_set(action->execution.surf_exec, action);
   }
-  DEBUG1("Create parallel execute action %p", action);
+  XBT_DEBUG("Create parallel execute action %p", action);
 
   return action;
 }
 
 void SIMIX_host_execution_destroy(smx_action_t action)
 {
-  DEBUG1("Destroy action %p", action);
-
-  if (action->name)
-    xbt_free(action->name);
+  XBT_DEBUG("Destroy action %p", action);
 
-  xbt_fifo_free(action->request_list);
+  xbt_free(action->name);
 
-  if (action->execution.surf_exec){
+  if (action->execution.surf_exec) {
     surf_workstation_model->action_unref(action->execution.surf_exec);
     action->execution.surf_exec = NULL;
   }
-  
-#ifdef HAVE_TRACING
-  TRACE_smx_action_destroy(action);
-#endif
-  xbt_free(action);
+
+  xbt_mallocator_release(simix_global->action_mallocator, action);
 }
 
 void SIMIX_host_execution_cancel(smx_action_t action)
 {
-  DEBUG1("Cancel action %p", action);
+  XBT_DEBUG("Cancel action %p", action);
 
-  if(action->execution.surf_exec) 
+  if (action->execution.surf_exec)
     surf_workstation_model->action_cancel(action->execution.surf_exec);
 }
 
 double SIMIX_host_execution_get_remains(smx_action_t action)
 {
-  double result = 0;
-  
-  if(action->state == SIMIX_RUNNING)
+  double result = 0.0;
+
+  if (action->state == SIMIX_RUNNING)
     result = surf_workstation_model->get_remains(action->execution.surf_exec);
 
   return result;
@@ -299,27 +291,27 @@ e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action)
 
 void SIMIX_host_execution_set_priority(smx_action_t action, double priority)
 {
-  surf_workstation_model->set_priority(action->execution.surf_exec, priority);
+  if(action->execution.surf_exec)
+    surf_workstation_model->set_priority(action->execution.surf_exec, priority);
 }
 
 void SIMIX_pre_host_execution_wait(smx_req_t req)
 {
   smx_action_t action = req->host_execution_wait.execution;
 
-  DEBUG2("Wait for execution of action %p, state %d", action, action->state);
+  XBT_DEBUG("Wait for execution of action %p, state %d", action, action->state);
 
   /* Associate this request to the action */
   xbt_fifo_push(action->request_list, req);
   req->issuer->waiting_action = action;
 
-#ifdef HAVE_MC
   /* set surf's action */
-  if(_surf_do_model_check){
+  if (MC_IS_ENABLED){
     action->state = SIMIX_DONE;
     SIMIX_execution_finish(action);
+    return;
   }
-#endif  
-    
+
   /* If the action is already finished then perform the error handling */
   if (action->state != SIMIX_RUNNING)
     SIMIX_execution_finish(action);
@@ -327,17 +319,19 @@ void SIMIX_pre_host_execution_wait(smx_req_t req)
 
 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->suspend(action->execution.surf_exec);
 }
 
 void SIMIX_execution_finish(smx_action_t action)
 {
-  xbt_fifo_item_t item;
+  volatile xbt_fifo_item_t item;
   smx_req_t req;
 
   xbt_fifo_foreach(action->request_list, item, req, smx_req_t) {
@@ -345,36 +339,41 @@ void SIMIX_execution_finish(smx_action_t action)
     switch (action->state) {
 
       case SIMIX_DONE:
-        /* do nothing, action done*/
-	DEBUG0("SIMIX_execution_finished: execution successful");
+        /* do nothing, action done */
+	XBT_DEBUG("SIMIX_execution_finished: execution successful");
         break;
-        
+
       case SIMIX_FAILED:
+        XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
         TRY {
-	  DEBUG1("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
-          THROW0(host_error, 0, "Host failed");
+          THROWF(host_error, 0, "Host failed");
         }
 	CATCH(req->issuer->running_ctx->exception) {
 	  req->issuer->doexception = 1;
 	}
       break;
-        
+
       case SIMIX_CANCELED:
+        XBT_DEBUG("SIMIX_execution_finished: execution canceled");
         TRY {
-	  DEBUG0("SIMIX_execution_finished: execution canceled");
-          THROW0(cancel_error, 0, "Canceled");
+          THROWF(cancel_error, 0, "Canceled");
         }
 	CATCH(req->issuer->running_ctx->exception) {
 	  req->issuer->doexception = 1;
         }
 	break;
-        
+
       default:
-        THROW_IMPOSSIBLE;
+        xbt_die("Internal error in SIMIX_execution_finish: unexpected action state %d",
+            action->state);
     }
     req->issuer->waiting_action = NULL;
+    req->host_execution_wait.result = action->state;
     SIMIX_request_answer(req);
   }
+
+  /* We no longer need it */
+  SIMIX_host_execution_destroy(action);
 }
 
 void SIMIX_post_host_execute(smx_action_t action)
@@ -382,19 +381,32 @@ void SIMIX_post_host_execute(smx_action_t action)
   /* FIXME: check if the host running the action failed or not*/
   /*if(surf_workstation_model->extension.workstation.get_state(action->host->host))*/
 
-  /* If the host running the action didn't fail, then the action was cancelled */
+  /* If the host running the action didn't fail, then the action was canceled */
   if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED)
      action->state = SIMIX_CANCELED;
   else
      action->state = SIMIX_DONE;
 
-  if (action->execution.surf_exec){
+  if (action->execution.surf_exec) {
     surf_workstation_model->action_unref(action->execution.surf_exec);
     action->execution.surf_exec = NULL;
   }
-  
+
   /* If there are requests associated with the action, then answer them */
   if (xbt_fifo_size(action->request_list))
     SIMIX_execution_finish(action);
 }
 
+
+#ifdef HAVE_TRACING
+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
+