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

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index 62e11134a5..db4429b655 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -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,21 +84,21 @@ void SIMIX_host_destroy(void *h)
  */
 xbt_dict_t SIMIX_host_get_dict(void)
 {
-  xbt_dict_t host_dict = xbt_dict_new();
+  xbt_dict_t host_dict = xbt_dict_new_homogeneous(NULL);
   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);
+            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)
+  xbt_assert(((simix_global != NULL)
                && (host_lib != NULL)),
               "Environment not set yet");
 
@@ -124,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);
@@ -146,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);
@@ -154,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);
@@ -172,15 +172,15 @@ 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;
 }
@@ -209,10 +209,6 @@ smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
     surf_workstation_model->set_priority(action->execution.surf_exec, priority);
   }
 
-#ifdef HAVE_TRACING
-  TRACE_smx_host_execute(action);
-#endif
-
   XBT_DEBUG("Create execute action %p", action);
 
   return action;
@@ -267,9 +263,6 @@ void SIMIX_host_execution_destroy(smx_action_t action)
     action->execution.surf_exec = NULL;
   }
 
-#ifdef HAVE_TRACING
-  TRACE_smx_action_destroy(action);
-#endif
   xbt_mallocator_release(simix_global->action_mallocator, action);
 }
 
@@ -338,7 +331,7 @@ void SIMIX_host_execution_resume(smx_action_t action)
 
 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) {
@@ -346,14 +339,14 @@ void SIMIX_execution_finish(smx_action_t action)
     switch (action->state) {
 
       case SIMIX_DONE:
-        /* do nothing, action done*/
+        /* 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 {
-	  XBT_DEBUG("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;
@@ -361,9 +354,9 @@ void SIMIX_execution_finish(smx_action_t action)
       break;
 
       case SIMIX_CANCELED:
+        XBT_DEBUG("SIMIX_execution_finished: execution canceled");
         TRY {
-	  XBT_DEBUG("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;
@@ -371,7 +364,8 @@ void SIMIX_execution_finish(smx_action_t action)
 	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;
@@ -387,7 +381,7 @@ 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