do not create a parallel task is it does not consume any resource... Return immediate...

[simgrid.git] / src / msg / gos.c

diff --git a/src/msg/gos.c b/src/msg/gos.c
index b6c1235..5c0092e 100644 (file)
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gos, msg,
  *  by an agent for handling some task.
  */
 
-/** \ingroup msg_gos_functions
+/* \ingroup msg_gos_functions
  * \brief This function is now deprecated and useless. Please stop using it.
  */
 MSG_error_t MSG_process_start(m_process_t process)
@@ -57,7 +57,7 @@ MSG_error_t MSG_task_get(m_task_t * task,
  * \param channel the channel on which the agent should be
    listening. This value has to be >=0 and < than the maximal
    number of channels fixed with MSG_set_channel_number().
- * \param timeout the maximum time to wait for a task before giving
+ * \param max_duration the maximum time to wait for a task before giving
     up. In such a case, \a task will not be modified and will still be
     equal to \c NULL when returning.
  * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING
@@ -233,7 +233,7 @@ MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration,
     h_simdata = h->simdata;
     
     DEBUG2("Probing on channel %d (%s)", channel,h->name);
-    while((item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]))) {
+    while(!(item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]))) {
       if(max_duration>0) {
        if(!first_time) {
          MSG_RETURN(MSG_OK);
@@ -307,7 +307,7 @@ MSG_error_t MSG_task_put(m_task_t task,
   local_host = ((simdata_process_t) process->simdata)->host;
   remote_host = dest;
 
-  DEBUG4("Trying to send a task (%lg Mb) from %s to %s on channel %d", 
+  DEBUG4("Trying to send a task (%g Mb) from %s to %s on channel %d", 
         task->simdata->message_size,local_host->name, remote_host->name, channel);
 
   xbt_fifo_push(((simdata_host_t) remote_host->simdata)->
@@ -439,6 +439,79 @@ MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task)
   }
 }
 
+m_task_t MSG_parallel_task_create(const char *name, 
+                                 int host_nb,
+                                 const m_host_t *host_list,
+                                 double *computation_amount,
+                                 double *communication_amount,
+                                 void *data)
+{
+  simdata_task_t simdata = xbt_new0(s_simdata_task_t,1);
+  m_task_t task = xbt_new0(s_m_task_t,1);
+  int i;
+
+  /* Task structure */
+  task->name = xbt_strdup(name);
+  task->simdata = simdata;
+  task->data = data;
+
+  /* Simulator Data */
+  simdata->sleeping = xbt_dynar_new(sizeof(m_process_t),NULL);
+  simdata->rate = -1.0;
+  simdata->using = 1;
+  simdata->sender = NULL;
+  simdata->host_nb = host_nb;
+  
+  simdata->host_list = xbt_new0(void *, host_nb);
+  simdata->comp_amount = computation_amount;
+  simdata->comm_amount = communication_amount;
+
+  for(i=0;i<host_nb;i++)
+    simdata->host_list[i] = host_list[i]->simdata->host;
+
+  return task;
+}
+
+
+static void __MSG_parallel_task_execute(m_process_t process, m_task_t task)
+{
+  simdata_task_t simdata = NULL;
+
+  CHECK_HOST();
+
+  simdata = task->simdata;
+
+  xbt_assert0(simdata->host_nb,"This is not a parallel task. Go to hell.");
+
+  simdata->compute = surf_workstation_resource->extension_public->
+  execute_parallel_task(task->simdata->host_nb,
+                       task->simdata->host_list,
+                       task->simdata->comp_amount,
+                       task->simdata->comm_amount,
+                       1.0,
+                       -1.0);
+  if(simdata->compute)
+    surf_workstation_resource->common_public->action_set_data(simdata->compute,task);
+}
+
+MSG_error_t MSG_parallel_task_execute(m_task_t task)
+{
+  m_process_t process = MSG_process_self();
+  MSG_error_t res;
+
+  DEBUG0("Computing on a tons of guys");
+  
+  __MSG_parallel_task_execute(process, task);
+
+  if(simdata->compute)
+    res = __MSG_wait_for_computation(process,task);
+  else 
+    res = MSG_OK;
+
+  return res;  
+}
+
+
 /** \ingroup msg_gos_functions
  * \brief Sleep for the specified number of seconds
  *
@@ -505,7 +578,7 @@ static int MSG_get_msgload(void)
    
   CHECK_HOST();
   
-  xbt_abort(0, "This function is still to be specified correctly (what do you mean by 'load', exactly?). In the meantime, please don't use it");
+  xbt_assert0(0, "This function is still to be specified correctly (what do you mean by 'load', exactly?). In the meantime, please don't use it");
   process = MSG_process_self();
   return xbt_fifo_size(process->simdata->host->simdata->process_list);
 }