Adding more verbose informations to Paje

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

diff --git a/src/msg/global.c b/src/msg/global.c
index 4f0cf72..171b93e 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -143,6 +143,7 @@ void MSG_paje_output(const char *filename)
     "% EntityType      string\n"
     "% Container       string\n"
     "% Value   string\n"
+    "% TaskName        string\n"
     "%EndEventDef\n"
     "%EventDef PajePopState    12\n"
     "% Time    date\n"

diff --git a/src/msg/gos.c b/src/msg/gos.c
index a223cec..dcc8e0c 100644 (file)
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -124,7 +124,7 @@ static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task,
     __MSG_process_unblock(t_simdata->sender);
   }
 
-  PAJE_PROCESS_PUSH_STATE(process,"C");  
+  PAJE_PROCESS_PUSH_STATE(process,"C",t);  
 
   do {
     DEBUG0("Waiting for action termination");
@@ -454,7 +454,7 @@ MSG_error_t MSG_task_put(m_task_t task,
   process->simdata->put_channel = -1;
 
 
-  PAJE_PROCESS_PUSH_STATE(process,"C");  
+  PAJE_PROCESS_PUSH_STATE(process,"C",task);  
 
   state=surf_workstation_resource->common_public->action_get_state(task_simdata->comm);
   while (state==SURF_ACTION_RUNNING) {
@@ -521,7 +521,7 @@ MSG_error_t MSG_task_execute(m_task_t task)
 
   __MSG_task_execute(process, task);
 
-  PAJE_PROCESS_PUSH_STATE(process,"E");  
+  PAJE_PROCESS_PUSH_STATE(process,"E",task);  
   res = __MSG_wait_for_computation(process,task);
   PAJE_PROCESS_POP_STATE(process);
   return res;

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 99455b2..a495bea 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -354,7 +354,7 @@ MSG_error_t MSG_process_suspend(m_process_t process)
 
   xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
 
-  PAJE_PROCESS_PUSH_STATE(process,"S");
+  PAJE_PROCESS_PUSH_STATE(process,"S",NULL);
 
   if(process!=MSG_process_self()) {
     simdata = process->simdata;
@@ -473,7 +473,7 @@ int __MSG_process_block(double max_duration)
 
   dummy = MSG_task_create(blocked_name, 0.0, 0, NULL);
   
-  PAJE_PROCESS_PUSH_STATE(process,"B");
+  PAJE_PROCESS_PUSH_STATE(process,"B",NULL);
 
   process->simdata->blocked=1;
   __MSG_task_execute(process,dummy);

diff --git a/src/msg/private.h b/src/msg/private.h
index 6d6c4cb..2fd78a5 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -171,10 +171,10 @@ int __MSG_process_isBlocked(m_process_t process);
   if(msg_global->paje_output) \
     fprintf(msg_global->paje_output,"10 %f S_t %p %s\n",\
             surf_get_clock(), (process),(state))
-#define PAJE_PROCESS_PUSH_STATE(process,state)\
+#define PAJE_PROCESS_PUSH_STATE(process,state,task)\
   if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,"11 %f S_t %p %s\n",\
-            surf_get_clock(), (process),(state))
+    fprintf(msg_global->paje_output,"11 %f S_t %p %s \"%s\"\n",\
+            surf_get_clock(), (process),(state),(task)?((m_task_t)(task))->name:"")
 #define PAJE_PROCESS_POP_STATE(process)\
   if(msg_global->paje_output) \
     fprintf(msg_global->paje_output,"12 %f S_t %p\n",\