X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b69e984a013e4e9e2d98fc4013cd1721bf2f0245..10f23d04cb0a60324df495c7b2e57704b57874b8:/src/simix/smx_action.c

diff --git a/src/simix/smx_action.c b/src/simix/smx_action.c
index 31caeab5fe..f3c318f6cc 100644
--- a/src/simix/smx_action.c
+++ b/src/simix/smx_action.c
@@ -25,16 +25,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_action, simix,
  * 	\return A new SIMIX action
  * */
 smx_action_t SIMIX_action_communicate(smx_host_t sender,
-				      smx_host_t receiver, char *name,
+				      smx_host_t receiver, const char *name,
 				      double size, double rate)
 {
+	 smx_action_t act;
+	 smx_simdata_action_t simdata;
+
   /* check if the host is active */
-  if (surf_workstation_resource->extension_public->
+  if (surf_workstation_model->extension_public->
       get_state(sender->simdata->host) != SURF_CPU_ON) {
     THROW1(network_error, 0,
 	   "Host %s failed, you cannot call this function", sender->name);
   }
-  if (surf_workstation_resource->extension_public->
+  if (surf_workstation_model->extension_public->
       get_state(receiver->simdata->host) != SURF_CPU_ON) {
     THROW1(network_error, 0,
 	   "Host %s failed, you cannot call this function",
@@ -42,9 +45,9 @@ smx_action_t SIMIX_action_communicate(smx_host_t sender,
   }
 
   /* alloc structures */
-  smx_action_t act = xbt_new0(s_smx_action_t, 1);
+  act = xbt_new0(s_smx_action_t, 1);
   act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
-  smx_simdata_action_t simdata = act->simdata;
+  simdata = act->simdata;
   act->cond_list = xbt_fifo_new();
 
   /* initialize them */
@@ -52,10 +55,10 @@ smx_action_t SIMIX_action_communicate(smx_host_t sender,
   simdata->source = sender;
 
 
-  simdata->surf_action = surf_workstation_resource->extension_public->
+  simdata->surf_action = surf_workstation_model->extension_public->
       communicate(sender->simdata->host,
 		  receiver->simdata->host, size, rate);
-  surf_workstation_resource->common_public->action_set_data(simdata->
+  surf_workstation_model->common_public->action_set_data(simdata->
 							    surf_action,
 							    act);
 
@@ -71,20 +74,23 @@ smx_action_t SIMIX_action_communicate(smx_host_t sender,
  * 	\param amount Task amount (in bytes)
  * 	\return A new SIMIX action
  * */
-smx_action_t SIMIX_action_execute(smx_host_t host, char *name,
+smx_action_t SIMIX_action_execute(smx_host_t host, const char *name,
 				  double amount)
 {
+	 smx_action_t act;
+	 smx_simdata_action_t simdata;
+
   /* check if the host is active */
-  if (surf_workstation_resource->extension_public->
+  if (surf_workstation_model->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 = xbt_new0(s_smx_action_t, 1);
   act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
-  smx_simdata_action_t simdata = act->simdata;
+  simdata = act->simdata;
   act->cond_list = xbt_fifo_new();
 
   /* initialize them */
@@ -92,10 +98,10 @@ smx_action_t SIMIX_action_execute(smx_host_t host, char *name,
   act->name = xbt_strdup(name);
 
   /* set communication */
-  simdata->surf_action = surf_workstation_resource->extension_public->
+  simdata->surf_action = surf_workstation_model->extension_public->
       execute(host->simdata->host, amount);
 
-  surf_workstation_resource->common_public->action_set_data(simdata->
+  surf_workstation_model->common_public->action_set_data(simdata->
 							    surf_action,
 							    act);
 
@@ -113,28 +119,30 @@ smx_action_t SIMIX_action_execute(smx_host_t host, char *name,
 smx_action_t SIMIX_action_sleep(smx_host_t host, double duration)
 {
   char name[] = "sleep";
+  smx_simdata_action_t simdata;
+  smx_action_t act;
 
   /* check if the host is active */
-  if (surf_workstation_resource->extension_public->
+  if (surf_workstation_model->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 = xbt_new0(s_smx_action_t, 1);
   act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
-  smx_simdata_action_t simdata = act->simdata;
+  simdata = act->simdata;
   act->cond_list = xbt_fifo_new();
 
   /* initialize them */
   simdata->source = host;
   act->name = xbt_strdup(name);
 
-  simdata->surf_action = surf_workstation_resource->extension_public->
+  simdata->surf_action = surf_workstation_model->extension_public->
       sleep(host->simdata->host, duration);
 
-  surf_workstation_resource->common_public->action_set_data(simdata->
+  surf_workstation_model->common_public->action_set_data(simdata->
 							    surf_action,
 							    act);
 
@@ -154,7 +162,7 @@ void SIMIX_action_cancel(smx_action_t action)
 
   DEBUG1("Cancel action %p", action);
   if (action->simdata->surf_action) {
-    surf_workstation_resource->common_public->action_cancel(action->
+    surf_workstation_model->common_public->action_cancel(action->
 							    simdata->
 							    surf_action);
   }
@@ -173,7 +181,7 @@ void SIMIX_action_set_priority(smx_action_t action, double priority)
   xbt_assert0((action != NULL)
 	      && (action->simdata != NULL), "Invalid parameter");
 
-  surf_workstation_resource->common_public->
+  surf_workstation_model->common_public->
       set_priority(action->simdata->surf_action, priority);
   return;
 }
@@ -186,7 +194,6 @@ void SIMIX_action_set_priority(smx_action_t action, double priority)
  */
 void SIMIX_action_destroy(smx_action_t action)
 {
-
   xbt_assert0((action != NULL), "Invalid parameter");
 
   xbt_assert1((xbt_fifo_size(action->cond_list) == 0),
@@ -200,7 +207,7 @@ void SIMIX_action_destroy(smx_action_t action)
   xbt_fifo_free(action->cond_list);
 
   if (action->simdata->surf_action)
-    action->simdata->surf_action->resource_type->common_public->
+    action->simdata->surf_action->model_type->common_public->
 	action_free(action->simdata->surf_action);
 
   xbt_free(action->simdata);
@@ -220,8 +227,34 @@ void SIMIX_register_action_to_condition(smx_action_t action,
 {
   xbt_assert0((action != NULL) && (cond != NULL), "Invalid parameters");
 
-  DEBUG2("Register action %p to condtion %p", action, cond);
+  DEBUG2("Register action %p to cond %p", action, cond);
+  __SIMIX_cond_display_actions(cond);
   xbt_fifo_push(cond->actions, action);
+  __SIMIX_cond_display_actions(cond);
+  DEBUG2("Register condition %p to action %p", cond, action);
+  __SIMIX_action_display_conditions(action);
+  xbt_fifo_push(action->cond_list, cond);
+  __SIMIX_action_display_conditions(action);
+}
+
+/**
+ * 	\brief Unset an action to a condition.
+ *
+ * 	Destroys the "links" from the condition to this action.
+ *	\param action SIMIX action
+ *	\param cond SIMIX cond
+ */
+void SIMIX_unregister_action_to_condition(smx_action_t action,
+					  smx_cond_t cond)
+{
+  xbt_assert0((action != NULL) && (cond != NULL), "Invalid parameters");
+
+  __SIMIX_cond_display_actions(cond);
+  xbt_fifo_remove_all(cond->actions, action);
+  __SIMIX_cond_display_actions(cond);
+  __SIMIX_action_display_conditions(action);
+  xbt_fifo_remove_all(action->cond_list, cond);
+  __SIMIX_action_display_conditions(action);
 }
 
 /**
@@ -236,32 +269,41 @@ double SIMIX_action_get_remains(smx_action_t action)
   return action->simdata->surf_action->remains;
 }
 
-smx_action_t SIMIX_action_parallel_execute(char *name, int workstation_nb,
-					   void **workstation_list,
+smx_action_t SIMIX_action_parallel_execute(char *name, int host_nb,
+					   smx_host_t *host_list,
 					   double *computation_amount,
 					   double *communication_amount,
 					   double amount, double rate)
 {
+  void **workstation_list = NULL;
+  smx_simdata_action_t simdata;
+  smx_action_t act;
+  int i;
 
   /* alloc structures */
-  smx_action_t act = xbt_new0(s_smx_action_t, 1);
+  act = xbt_new0(s_smx_action_t, 1);
   act->simdata = xbt_new0(s_smx_simdata_action_t, 1);
-  smx_simdata_action_t simdata = act->simdata;
+  simdata = act->simdata;
   act->cond_list = xbt_fifo_new();
 
   /* initialize them */
   act->name = xbt_strdup(name);
 
-  /* set communication */
+  /* set action */
+
+  workstation_list = xbt_new0(void *,host_nb);
+  for (i = 0; i < host_nb; i++)
+    workstation_list[i] = host_list[i]->simdata->host;
+
   simdata->surf_action =
-      surf_workstation_resource->extension_public->
-      execute_parallel_task(workstation_nb, workstation_list,
+      surf_workstation_model->extension_public->
+      execute_parallel_task(host_nb, workstation_list,
 			    computation_amount, communication_amount,
 			    amount, rate);
 
-  surf_workstation_resource->common_public->action_set_data(simdata->
-							    surf_action,
-							    act);
+  surf_workstation_model->common_public->action_set_data(simdata->
+							 surf_action,
+							 act);
 
   return act;
 }
@@ -269,7 +311,27 @@ smx_action_t SIMIX_action_parallel_execute(char *name, int workstation_nb,
 e_surf_action_state_t SIMIX_action_get_state(smx_action_t action)
 {
   xbt_assert0((action != NULL), "Invalid parameter");
-  return surf_workstation_resource->common_public->
+  return surf_workstation_model->common_public->
       action_get_state(action->simdata->surf_action);
 
 }
+
+void __SIMIX_cond_display_actions(smx_cond_t cond)
+{
+  xbt_fifo_item_t item = NULL;
+  smx_action_t action = NULL;
+
+  DEBUG1("Actions for condition %p", cond);
+  xbt_fifo_foreach(cond->actions, item, action, smx_action_t)
+      DEBUG1("\t %p", action);
+}
+
+void __SIMIX_action_display_conditions(smx_action_t action)
+{
+  xbt_fifo_item_t item = NULL;
+  smx_cond_t cond = NULL;
+
+  DEBUG1("Conditions for action %p", action);
+  xbt_fifo_foreach(action->cond_list, item, cond, smx_cond_t)
+      DEBUG1("\t %p", cond);
+}