SIMIX2 renamed some of the tracing stuff.

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

diff --git a/src/instr/private.h b/src/instr/private.h
index e57eb0a..5c29488 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -126,7 +126,7 @@ void TRACE_msg_volume_start(m_task_t task);
 void TRACE_msg_volume_finish(m_task_t task);
 
 /* from smx.c */
 void TRACE_msg_volume_finish(m_task_t task);
 
 /* from smx.c */

-void TRACE_smx_action_execute(smx_action_t act);
+void TRACE_smx_host_execute(smx_action_t act);

 void TRACE_smx_action_communicate(smx_action_t act, smx_process_t proc);
 void TRACE_smx_action_destroy(smx_action_t act);
 
 void TRACE_smx_action_communicate(smx_action_t act, smx_process_t proc);
 void TRACE_smx_action_destroy(smx_action_t act);
 

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 0da3641..1a7e1cd 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -394,8 +394,8 @@ static XBT_INLINE void SIMIX_comm_start(smx_action_t action)
     action->state = SIMIX_RUNNING;
 
 #ifdef HAVE_TRACING
     action->state = SIMIX_RUNNING;
 
 #ifdef HAVE_TRACING

-    TRACE_smx_action_communicate(comm, comm->comm.src_proc);
-    TRACE_surf_action(comm->surf_action, comm->category);
+    TRACE_smx_action_communicate(action, action->comm.src_proc);
+    TRACE_surf_action(action->comm.surf_comm, action->category);

 #endif
 
     /* If a link is failed, detect it immediately */
 #endif
 
     /* If a link is failed, detect it immediately */

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 7272966..8eed30e 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -462,7 +462,7 @@ void SIMIX_process_sleep_destroy(smx_action_t action)
   if (action->sleep.surf_sleep)
     action->sleep.surf_sleep->model_type->action_unref(action->sleep.surf_sleep);
 #ifdef HAVE_TRACING
   if (action->sleep.surf_sleep)
     action->sleep.surf_sleep->model_type->action_unref(action->sleep.surf_sleep);
 #ifdef HAVE_TRACING

-  TRACE_smx_action_destroy(act);
+  TRACE_smx_action_destroy(action);

 #endif
   xbt_fifo_free(action->request_list);
   xbt_free(action);
 #endif
   xbt_fifo_free(action->request_list);
   xbt_free(action);