X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d4f44983b405f88e6320243ef5781d0d654618c..407a83cbc983ae0d5773c1a418b1c4e580caa37a:/src/msg/gos.c

diff --git a/src/msg/gos.c b/src/msg/gos.c
index 0487c955de..4d17772cfd 100644
--- 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)
@@ -211,6 +211,60 @@ int MSG_task_probe_from(m_channel_t channel)
   return MSG_process_get_PID(t->simdata->sender);
 }
 
+MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration,
+				    int *PID)
+{
+  m_host_t h = NULL;
+  simdata_host_t h_simdata = NULL;
+  xbt_fifo_item_t item;
+  m_task_t t;
+  int first_time = 1;
+  m_process_t process = MSG_process_self();
+
+  if(PID) {
+    *PID = -1;
+  }
+
+  if(max_duration==0.0) {
+    return MSG_task_probe_from(channel);
+  } else {
+    CHECK_HOST();
+    h = MSG_host_self();
+    h_simdata = h->simdata;
+    
+    DEBUG2("Probing on channel %d (%s)", channel,h->name);
+    while(!(item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]))) {
+      if(max_duration>0) {
+	if(!first_time) {
+	  MSG_RETURN(MSG_OK);
+	}
+      }
+      xbt_assert2(!(h_simdata->sleeping[channel]),
+		  "A process (%s(%d)) is already blocked on this channel",
+		  h_simdata->sleeping[channel]->name,
+		  h_simdata->sleeping[channel]->simdata->PID);
+      h_simdata->sleeping[channel] = process; /* I'm waiting. Wake me up when you're ready */
+      if(max_duration>0) {
+	__MSG_process_block(max_duration);
+      } else {
+	__MSG_process_block(-1);
+      }
+      if(surf_workstation_resource->extension_public->get_state(h_simdata->host) 
+	 == SURF_CPU_OFF) {
+	MSG_RETURN(MSG_HOST_FAILURE);
+      }
+      h_simdata->sleeping[channel] = NULL;
+      first_time = 0;
+    }
+    if (!item || !(t = xbt_fifo_get_item_content(item))) {
+      MSG_RETURN(MSG_OK);
+    }
+    if(PID) {
+      *PID = MSG_process_get_PID(t->simdata->sender);
+    }
+    MSG_RETURN(MSG_OK);
+  }
+}
 /** \ingroup msg_gos_functions
  * \brief Put a task on a channel of an host and waits for the end of the
  * transmission.
@@ -445,12 +499,13 @@ MSG_error_t MSG_process_sleep(double nb_sec)
  * \brief Return the number of MSG tasks currently running on a
  * the host of the current running process.
  */
-int MSG_get_msgload(void) 
+static int MSG_get_msgload(void) 
 {
   m_process_t process;
    
   CHECK_HOST();
   
+  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);
 }