X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5979fe52092423ac8915b118cff1e161e57d1ecb..1d093eb0c576e2f7a1d6c7a707ee55026aca3915:/src/simix/smx_action.c

diff --git a/src/simix/smx_action.c b/src/simix/smx_action.c
index ac4560010b..0bcd505c7e 100644
--- a/src/simix/smx_action.c
+++ b/src/simix/smx_action.c
@@ -8,6 +8,7 @@
 
 #include "private.h"
 #include "xbt/log.h"
+#include "xbt/ex.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_action, simix,
 				"Logging specific to SIMIX (action)");
@@ -18,17 +19,17 @@ smx_action_t SIMIX_action_communicate(smx_host_t sender,smx_host_t receiver,char
 {
 	/* check if the host is active */
  	if ( surf_workstation_resource->extension_public->get_state(sender->simdata->host)!=SURF_CPU_ON) {
-		THROW1(1,1,"Host %s failed, you cannot call this function",sender->name);
+		THROW1(network_error,0,"Host %s failed, you cannot call this function",sender->name);
 	}
 	if ( surf_workstation_resource->extension_public->get_state(receiver->simdata->host)!=SURF_CPU_ON) {
-		THROW1(1,1,"Host %s failed, you cannot call this function",receiver->name);
+		THROW1(network_error,0,"Host %s failed, you cannot call this function",receiver->name);
 	}
 
 	/* alloc structures */
 	smx_action_t act = xbt_new0(s_smx_action_t,1);
-	act->simdata = xbt_new0(s_simdata_action_t,1);
-	simdata_action_t simdata = act->simdata;
-	simdata->cond_list = xbt_fifo_new();
+	act->simdata = xbt_new0(s_smx_simdata_action_t,1);
+	smx_simdata_action_t simdata = act->simdata;
+	act->cond_list = xbt_fifo_new();
 	
 	/* initialize them */
 	act->name = xbt_strdup(name);
@@ -46,14 +47,14 @@ smx_action_t SIMIX_action_execute(smx_host_t host, char * name, double amount)
 {
 	/* check if the host is active */
  	if ( surf_workstation_resource->extension_public->get_state(host->simdata->host)!=SURF_CPU_ON) {
-		THROW1(1,1,"Host %s failed, you cannot call this function",host->name);
+		THROW1(host_error,0,"Host %s failed, you cannot call this function",host->name);
 	}
 
 	/* alloc structures */
 	smx_action_t act = xbt_new0(s_smx_action_t,1);
-	act->simdata = xbt_new0(s_simdata_action_t,1);
-	simdata_action_t simdata = act->simdata;
-	simdata->cond_list = xbt_fifo_new();
+	act->simdata = xbt_new0(s_smx_simdata_action_t,1);
+	smx_simdata_action_t simdata = act->simdata;
+	act->cond_list = xbt_fifo_new();
 	
 	/* initialize them */
 	simdata->source = host;
@@ -70,13 +71,19 @@ smx_action_t SIMIX_action_execute(smx_host_t host, char * name, double amount)
 
 
 smx_action_t SIMIX_action_sleep(smx_host_t host,  double duration)
-{
+{		
 	char name[] = "sleep";
+
+	/* check if the host is active */
+ 	if ( surf_workstation_resource->extension_public->get_state(host->simdata->host)!=SURF_CPU_ON) {
+		THROW1(host_error,0,"Host %s failed, you cannot call this function",host->name);
+	}
+
 	/* alloc structures */
 	smx_action_t act = xbt_new0(s_smx_action_t,1);
-	act->simdata = xbt_new0(s_simdata_action_t,1);
-	simdata_action_t simdata = act->simdata;
-	simdata->cond_list = xbt_fifo_new();
+	act->simdata = xbt_new0(s_smx_simdata_action_t,1);
+	smx_simdata_action_t simdata = act->simdata;
+	act->cond_list = xbt_fifo_new();
 	
 	/* initialize them */
 	simdata->source = host;
@@ -115,16 +122,18 @@ void SIMIX_action_destroy(smx_action_t action)
 
 	xbt_assert0((action != NULL), "Invalid parameter");
 
-	xbt_assert1((xbt_fifo_size(action->simdata->cond_list)==0), 
-			"Conditional list not empty %d. There is a problem. Cannot destroy it now!", xbt_fifo_size(action->simdata->cond_list));
+	xbt_assert1((xbt_fifo_size(action->cond_list)==0), 
+			"Conditional list not empty %d. There is a problem. Cannot destroy it now!", xbt_fifo_size(action->cond_list));
 
-	if(action->name) free(action->name);
+	if(action->name) xbt_free(action->name);
 
-	xbt_fifo_free(action->simdata->cond_list);
+	xbt_fifo_free(action->cond_list);
 
 	if(action->simdata->surf_action) 
 		action->simdata->surf_action->resource_type->common_public->action_free(action->simdata->surf_action);
 
+	xbt_free(action->simdata);
+	xbt_free(action);
 	return;
 }
 
@@ -135,3 +144,8 @@ void SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond)
 	xbt_fifo_push(cond->actions,action);
 }
 
+double SIMIX_action_get_remains(smx_action_t action) 
+{
+  xbt_assert0((action != NULL), "Invalid parameter");
+	return action->simdata->surf_action->remains;
+}