X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e276e9953a9ab5894bbb623fc17ec79512efab5d..baca7024fc7c8a8231d947be38fd7627348487fd:/src/simix/smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index fec6e6990b..b655087917 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;
 }
@@ -77,23 +77,13 @@ void SIMIX_host_destroy(void *h)
   return;
 }
 
-/**
- * \brief Returns a dict of all hosts.
- *
- * \return List of all hosts (as a #xbt_dict_t)
- */
-xbt_dict_t SIMIX_host_get_dict(void)
-{
-  return simix_global->host;
-}
-
 smx_host_t SIMIX_host_get_by_name(const char *name)
 {
   xbt_assert0(((simix_global != NULL)
-               && (simix_global->host != 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)
@@ -177,13 +167,13 @@ void SIMIX_host_set_data(smx_host_t host, void *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;
 
@@ -191,23 +181,20 @@ smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
   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,10 +208,9 @@ 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? */
 
@@ -237,31 +223,25 @@ 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  
-  {
+  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);
+    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) {
     surf_workstation_model->action_unref(action->execution.surf_exec);
@@ -271,14 +251,14 @@ void SIMIX_host_execution_destroy(smx_action_t action)
 #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);
 }
 
@@ -299,26 +279,26 @@ 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)
@@ -327,12 +307,14 @@ void SIMIX_pre_host_execution_wait(smx_req_t req)
 
 void SIMIX_host_execution_suspend(smx_action_t action)
 {
-  surf_workstation_model->suspend(action->execution.surf_exec);
+  if(action->execution.surf_exec)
+    surf_workstation_model->suspend(action->execution.surf_exec);
 }
 
 void SIMIX_host_execution_resume(smx_action_t action)
 {
-  surf_workstation_model->suspend(action->execution.surf_exec);
+  if(action->execution.surf_exec)
+    surf_workstation_model->suspend(action->execution.surf_exec);
 }
 
 void SIMIX_execution_finish(smx_action_t action)
@@ -346,12 +328,12 @@ void SIMIX_execution_finish(smx_action_t action)
 
       case SIMIX_DONE:
         /* do nothing, action done*/
-	DEBUG0("SIMIX_execution_finished: execution successful");
+	XBT_DEBUG("SIMIX_execution_finished: execution successful");
         break;
 
       case SIMIX_FAILED:
         TRY {
-	  DEBUG1("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
+	  XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
           THROW0(host_error, 0, "Host failed");
         }
 	CATCH(req->issuer->running_ctx->exception) {
@@ -361,7 +343,7 @@ void SIMIX_execution_finish(smx_action_t action)
 
       case SIMIX_CANCELED:
         TRY {
-	  DEBUG0("SIMIX_execution_finished: execution canceled");
+	  XBT_DEBUG("SIMIX_execution_finished: execution canceled");
           THROW0(cancel_error, 0, "Canceled");
         }
 	CATCH(req->issuer->running_ctx->exception) {
@@ -373,8 +355,12 @@ void SIMIX_execution_finish(smx_action_t action)
         THROW_IMPOSSIBLE;
     }
     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)
@@ -398,3 +384,16 @@ void SIMIX_post_host_execute(smx_action_t action)
     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
+