Remove deprecate swith macro ALVIN_SPECIAL_LOGING, use default paje macro directive

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

diff --git a/src/msg/private.h b/src/msg/private.h
index 3e30b4f..210c173 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -130,51 +130,7 @@ XBT_PUBLIC m_task_t task_mallocator_new_f(void);
 XBT_PUBLIC void task_mallocator_free_f(m_task_t task);
 XBT_PUBLIC void task_mallocator_reset_f(m_task_t task);
 
 XBT_PUBLIC void task_mallocator_free_f(m_task_t task);
 XBT_PUBLIC void task_mallocator_reset_f(m_task_t task);
 

-#ifdef ALVIN_SPECIAL_LOGING
-#define PAJE_PROCESS_STATE(process,state)\
-  if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,"10 %f S_t P%d %s\n",\
-            surf_get_clock(), (process)->simdata->PID,(state))
-#define PAJE_PROCESS_PUSH_STATE(process,state)\
-  if(msg_global->paje_output) { \
-    fprintf(msg_global->paje_output,"11 %f S_t P%d %s\n",\
-            surf_get_clock(), (process)->simdata->PID,(state));\
-    (process)->simdata->paje_state++; \
-  }
-#define PAJE_PROCESS_POP_STATE(process)\
-  if(msg_global->paje_output) { \
-    fprintf(msg_global->paje_output,"12 %f S_t P%d\n",\
-            surf_get_clock(), (process)->simdata->PID); \
-    (process)->simdata->paje_state--; \
-  }
-#define PAJE_PROCESS_FREE(process)
-#define PAJE_PROCESS_NEW(process)\
-  if((msg_global->paje_output)) {\
-    if((msg_global->session==0) || ((msg_global->session>0) && ((process)->simdata->PID > msg_global->paje_maxPID))) \
-    fprintf(msg_global->paje_output,"7 %f P%d P_t %p \"%s %d (%d)\"\n", \
-            surf_get_clock(), (process)->simdata->PID, (process)->simdata->host, \
-            (process)->name, (process)->simdata->PID, msg_global->session);\
-    if(msg_global->paje_maxPID<(process)->simdata->PID) msg_global->paje_maxPID=(process)->simdata->PID;\
-    }
-#define PAJE_COMM_START(process,task,channel)\
-  if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,\
-           "16 %f      Comm    CUR     COMM_%d P%d     %p\n", \
-            surf_get_clock(), channel, (process)->simdata->PID, task)
-#define PAJE_COMM_STOP(process,task,channel)\
-  if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,\
-           "17 %f      Comm    CUR     COMM_%d P%d     %p\n", \
-            surf_get_clock(), channel, (process)->simdata->PID, task)
-#define PAJE_HOST_NEW(host)\
-  if(msg_global->paje_output)\
-    fprintf(msg_global->paje_output,"7 %f %p H_t CUR \"%s\"\n",surf_get_clock(), \
-           host, host->name)
-#define PAJE_HOST_FREE(host)\
-  if(msg_global->paje_output)\
-    fprintf(msg_global->paje_output,"8 %f %p H_t\n",surf_get_clock(), host)

 
 

-#else

 
 #define PAJE_PROCESS_STATE(process,state)\
   if(msg_global->paje_output) \
 
 #define PAJE_PROCESS_STATE(process,state)\
   if(msg_global->paje_output) \


@@ -216,5 +172,5 @@ XBT_PUBLIC void task_mallocator_reset_f(m_task_t task);
   if(msg_global->paje_output)\
     fprintf(msg_global->paje_output,"8 %f %p H_t\n",surf_get_clock(), host);
 
   if(msg_global->paje_output)\
     fprintf(msg_global->paje_output,"8 %f %p H_t\n",surf_get_clock(), host);
 

-#endif /* Alvin_Special_Loging */
+

 #endif
 #endif