New functions added, changes in the header files, function create_link(cond, action...

[simgrid.git] / src / simix / smx_action.c

diff --git a/src/simix/smx_action.c b/src/simix/smx_action.c
index 8be954c..dc09c63 100644 (file)
--- a/src/simix/smx_action.c
+++ b/src/simix/smx_action.c
@@ -14,35 +14,93 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_action, simix,
 
 /************************************* Actions *********************************/
 
-smx_action_t SIMIX_communicate(smx_host_t sender,smx_host_t receiver, double size)
+smx_action_t SIMIX_communicate(smx_host_t sender,smx_host_t receiver,char * name, double size, double rate)
 {
-       return xbt_new0(s_smx_action_t,1);
+
+       /* 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();
+       
+       /* initialize them */
+       act-> name = xbt_strdup(name);
+
+
+
+       simdata->surf_action = surf_workstation_resource->extension_public->
+               communicate(sender->simdata->host,
+                               receiver->simdata->host, size, rate);
+       surf_workstation_resource->common_public->action_set_data(simdata->surf_action,act);
+
+       return act;
 }
 
-smx_action_t SIMIX_execute(smx_host_t host,double amount)
+smx_action_t SIMIX_execute(smx_host_t host, char * name, double amount)
 {
-       return xbt_new0(s_smx_action_t,1);
+       CHECK_HOST();
+       /* 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();
+       
+       /* initialize them */
+       simdata->source = host;
+       act-> name = xbt_strdup(name);
+
+       /* set communication */
+       simdata->surf_action = surf_workstation_resource->extension_public->
+               execute(host->simdata->host, amount);
+
+       surf_workstation_resource->common_public->action_set_data(simdata->surf_action,act);
+
+       return act;
 }
 
 SIMIX_error_t SIMIX_action_cancel(smx_action_t action)
 {
+  xbt_assert0((action != NULL), "Invalid parameter");
 
-       return SIMIX_OK;
+  if(action->simdata->surf_action) {
+    surf_workstation_resource->common_public->action_cancel(action->simdata->surf_action);
+    return SIMIX_OK;
+  }
+  return SIMIX_FATAL;
 }
 
 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->
+               set_priority(action->simdata->surf_action, priority);
        return;
 }
 
 SIMIX_error_t SIMIX_action_destroy(smx_action_t action)
 {
+
+       xbt_assert0((action != NULL), "Invalid parameter");
+
+       xbt_assert0((xbt_fifo_size(action->simdata->cond_list)==0), 
+                       "Conditional list not empty. There is a problem. Cannot destroy it now!");
+
+       if(action->name) free(action->name);
+
+       xbt_fifo_free(action->simdata->cond_list);
+
+       if(action->simdata->surf_action) 
+               action->simdata->surf_action->resource_type->common_public->action_free(action->simdata->surf_action);
+
        return SIMIX_OK;
 }
 
-void SIMIX_create_link(smx_action_t action, smx_cond_t cond)
+void SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond)
 {
+       xbt_assert0( (action != NULL) && (cond != NULL), "Invalid parameters");
 
+       xbt_fifo_push(cond->actions,action);
 }
 
 SIMIX_error_t __SIMIX_wait_for_action(smx_process_t process, smx_action_t action)