From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 3 Oct 2005 15:44:06 +0000 (+0000)
Subject: Add some debugging messages.
X-Git-Tag: v3.3~3610
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7d9c844f205d622335b2e0895c9f37483fa1fd89

Add some debugging messages.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1747 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/msg/gos.c b/src/msg/gos.c
index a5b2646b77..9ff23a6eeb 100644
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -104,6 +104,8 @@ MSG_error_t MSG_task_get_with_time_out(m_task_t * task,
     /* OK, we should both be ready now. Are you there ? */
   }
 
+  DEBUG1("OK, got a task (%s)", t->name);
+
   t_simdata = t->simdata;
   /*   *task = __MSG_task_copy(t); */
   *task=t;
@@ -111,21 +113,24 @@ MSG_error_t MSG_task_get_with_time_out(m_task_t * task,
   /* Transfer */
   t_simdata->using++;
 
+  DEBUG0("Calling SURF for communication creation");
   t_simdata->comm = surf_workstation_resource->extension_public->
     communicate(MSG_process_get_host(t_simdata->sender)->simdata->host,
 		h->simdata->host, t_simdata->message_size,t_simdata->rate);
   
   surf_workstation_resource->common_public->action_set_data(t_simdata->comm,t);
 
-  if(__MSG_process_isBlocked(t_simdata->sender)) 
+  if(__MSG_process_isBlocked(t_simdata->sender))
     __MSG_process_unblock(t_simdata->sender);
 
   PAJE_PROCESS_PUSH_STATE(process,"C");  
 
   do {
+    DEBUG0("Waiting for action termination");
     __MSG_task_wait_event(process, t);
     state=surf_workstation_resource->common_public->action_get_state(t_simdata->comm);
   } while (state==SURF_ACTION_RUNNING);
+  DEBUG0("Action terminated");
 
   if(t->simdata->using>1) {
     xbt_fifo_unshift(msg_global->process_to_run,process);
@@ -311,13 +316,18 @@ MSG_error_t MSG_task_put(m_task_t task,
 
   PAJE_COMM_START(process,task,channel);
     
-  if(remote_host->simdata->sleeping[channel]) 
+  if(remote_host->simdata->sleeping[channel]) {
+    DEBUG0("Somebody is listening. Let's wake him up!");
     __MSG_process_unblock(remote_host->simdata->sleeping[channel]);
+  }
 
   process->simdata->put_host = dest;
   process->simdata->put_channel = channel;
-  while(!(task_simdata->comm)) 
+  while(!(task_simdata->comm)) {
+    DEBUG0("Communication not initiated yet. Let's block!");
     __MSG_process_block(-1);
+  }
+  DEBUG0("Registering to this communication");
   surf_workstation_resource->common_public->action_use(task_simdata->comm);
   process->simdata->put_host = NULL;
   process->simdata->put_channel = -1;
@@ -327,10 +337,11 @@ MSG_error_t MSG_task_put(m_task_t task,
 
   state=surf_workstation_resource->common_public->action_get_state(task_simdata->comm);
   while (state==SURF_ACTION_RUNNING) {
+    DEBUG0("Waiting for action termination");
     __MSG_task_wait_event(process, task);
     state=surf_workstation_resource->common_public->action_get_state(task_simdata->comm);
   }
-    
+  DEBUG0("Action terminated");
 
   PAJE_PROCESS_POP_STATE(process);  
 
diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index ddbb302315..4d6c45bb13 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -444,12 +444,19 @@ int MSG_process_is_suspended(m_process_t process)
   return (process->simdata->suspended);
 }
 
+static char blocked_name[512];
+
 int __MSG_process_block(double max_duration)
 {
   m_process_t process = MSG_process_self();
 
   m_task_t dummy = MSG_TASK_UNINITIALIZED;
-  dummy = MSG_task_create("blocked", 0.0, 0, NULL);
+  snprintf(blocked_name,512,"blocked (%s:%s)",process->name,
+	  process->simdata->host->name);
+
+  XBT_IN1(": max_duration=%g",max_duration);
+
+  dummy = MSG_task_create(blocked_name, 0.0, 0, NULL);
   
   PAJE_PROCESS_PUSH_STATE(process,"B");
 
@@ -467,6 +474,7 @@ int __MSG_process_block(double max_duration)
   
   MSG_task_destroy(dummy);
 
+  XBT_OUT;
   return 1;
 }
 
@@ -478,9 +486,12 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
   CHECK_HOST();
 
+  XBT_IN2(": %s unblocking %s", MSG_process_self()->name,process->name);
+
   simdata = process->simdata;
   if(!(simdata->waiting_task)) {
     xbt_assert0(0,"Process not waiting for anything else. Weird !");
+    XBT_OUT;
     return MSG_WARNING;
   }
   simdata_task = simdata->waiting_task->simdata;
@@ -491,6 +502,8 @@ MSG_error_t __MSG_process_unblock(m_process_t process)
 
   PAJE_PROCESS_POP_STATE(process);
 
+  XBT_OUT;
+
   MSG_RETURN(MSG_OK);
 }